[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] arch and bookmark maintenance
From: |
Andrew Suffield |
Subject: |
Re: [Gnu-arch-users] arch and bookmark maintenance |
Date: |
Fri, 19 Dec 2003 12:48:37 +0000 |
User-agent: |
Mutt/1.5.4i |
On Thu, Dec 18, 2003 at 04:41:57PM -0500, Aaron Bentley wrote:
> On Thu, 2003-12-18 at 15:58, Andrew Suffield wrote:
>
> > It should be fairly obvious from this that diff/patch are not what you
> > want, by a long shot.
>
> I think what you mean specifically is:
>
> In typical useage, insertions happen in a very limited number of
> places. If merging is needed at all, it is likely that two insertions
> will happen in the same place, and this is treated as a conflict by
> diff/patch.
>
> Is that what you're saying?
That's a description of one of the problems you'll encounter. There's
a whole pile of fairly similar ones.
--
.''`. ** Debian GNU/Linux ** | Andrew Suffield
: :' : http://www.debian.org/ |
`. `' |
`- -><- |
signature.asc
Description: Digital signature
- [Gnu-arch-users] arch and bookmark maintenance, , 2003/12/16
- Re: [Gnu-arch-users] arch and bookmark maintenance, , 2003/12/18
- Re: [Gnu-arch-users] arch and bookmark maintenance, Andrew Suffield, 2003/12/18
- [Gnu-arch-users] Re: arch and bookmark maintenance, michael josenhans, 2003/12/18
- Re: [Gnu-arch-users] Re: arch and bookmark maintenance, Andrew Suffield, 2003/12/19
- [Gnu-arch-users] Re: arch and bookmark maintenance, michael josenhans, 2003/12/21
- Re: [Gnu-arch-users] Re: arch and bookmark maintenance, David Allouche, 2003/12/26
Re: [Gnu-arch-users] arch and bookmark maintenance, , 2003/12/19