[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhanc
From: |
Andrew Suffield |
Subject: |
Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements |
Date: |
Thu, 6 May 2004 18:36:02 +0100 |
User-agent: |
Mutt/1.5.5.1+cvs20040105i |
On Wed, May 05, 2004 at 01:04:55PM -0700, Tom Lord wrote:
> Wow. Talk about catching up. Your new proposed merge request
> format passed completely beneath my radar during the move.
>
> For reference, the format is currently documented at:
>
> http://www.greenrd.org/sw/arch/mergereq/spec.html
>
> I can puzzle out the meaning of the enclosed request easily enough.
>
> I think the general direction of your proposed format is right, but
> the details are an open question.
>
> One thing I don't see is a way to specify a merge which consists of a
> list of specific, non-contiguous changesets.
My gut feeling is that the 'right' way to specify a merge is by giving
the revision to merge into, and a list of revisions to apply, suitable
for replay --list. Optional metadata on top of that can provide hints
for inexact patching. I don't think we have a tool which can generate
that list for any of the merge methods barring replay, though.
--
.''`. ** Debian GNU/Linux ** | Andrew Suffield
: :' : http://www.debian.org/ |
`. `' |
`- -><- |
signature.asc
Description: Digital signature
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Tom Lord, 2004/05/05
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Robin Green, 2004/05/05
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements,
Andrew Suffield <=
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Tom Lord, 2004/05/06
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Aaron Bentley, 2004/05/06
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Tom Lord, 2004/05/06
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Aaron Bentley, 2004/05/06
- [Gnu-arch-users] star-merge vs apply-delta (was: [MERGE REQUEST: lord] documentation and help enhancements), Stefan Monnier, 2004/05/06
- Re: [Gnu-arch-users] star-merge vs apply-delta (was: [MERGE REQUEST: lord] documentation and help enhancements), Miles Bader, 2004/05/06
- Re: [Gnu-arch-users] star-merge vs apply-delta (was: [MERGE REQUEST: lord] documentation and help enhancements), Robert Collins, 2004/05/07
- Re: [Gnu-arch-users] star-merge vs apply-delta, Matthieu Moy, 2004/05/07
- [Gnu-arch-users] Re: star-merge vs apply-delta, Stefan Monnier, 2004/05/09