gnu-arch-users
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnu-arch-users] Re: Common merge request format


From: Aaron Bentley
Subject: [Gnu-arch-users] Re: Common merge request format
Date: Thu, 08 Apr 2004 23:36:20 -0400
User-agent: Mozilla Thunderbird 0.5 (X11/20040306)

Robin Green wrote:
On Wed, Apr 07, 2004 at 01:59:25PM +0100, I suggested:

Also, [attention asuffield!] I'm sure it can't have escaped people's attention
that it would be nice to have a _standardised_ format or single command that
one could put in an email to describe a merge request. Then the maintainer
could just cut and paste that one line, or even set up a special keybinding in
their mail client, to begin the review process.


OK, I'd like to formalise this. I'm now thinking not one line, but something
of the form:

--- begin tla merge request ---
# comments can go anywhere - although one would hope that the log messages
# would sufficiently describe the change for review purposes.
From-Archive-Name:       address@hidden  # this is another comment
From-Archive-Location:   http://bogus.example.com/foo
From-Revision:           tla--me--2.0--patch256
From-Gpg-Key:            http://bogus.example.com/gpg-keys/me.gpg
From-Gpg-Key:            http://bogus.example.com/gpg-keys/my-friend.gpg
To-Archive-Name:         address@hidden
To-Archive-Location:     http://bogus.example.com/tla
To-Revision:             tla--devo--2.0

# multiple requests can be specifed; if the destination is omitted,
# it is assumed to be the same destination as the previous request.
--- end tla merge request ---

in which the begin and end lines are required and spaces, comments are ignored.

Have I missed anything?

Possibly. apply-delta can be used for merging, but it's best supported with a format like this:
From-Revisions: address@hidden/tla--devo--1.3--patch-1 -
  address@hidden/tlasrc--backbuild--1--patch-26

Replay could also use data in that format, in some cases.

That makes the From-Archive-Name redundant, but not the From-Archive-Location. However, archives contain the archive name, so you don't technically need to include it.

From-Revisions: address@hidden/tla--devo--1.3--patch-1 -
  address@hidden/tlasrc--backbuild--1--patch-26
From-Gpg-Key:            http://bogus.example.com/gpg-keys/me.gpg
From-Gpg-Key:            http://bogus.example.com/gpg-keys/my-friend.gpg
From-Archive-Location:   http://bogus.example.com/foo
To-Archive-Name:         address@hidden
To-Archive-Location:     http://bogus.example.com/tla
To-Revision:             tla--devo--2.0

You may also want to define what happens when archive locations differ from what the merging person already has registered. I'd suggest defaulting to the registered value.

Aaron




reply via email to

[Prev in Thread] Current Thread [Next in Thread]