[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Some issues
From: |
Miles Bader |
Subject: |
Re: [Gnu-arch-users] Some issues |
Date: |
Wed, 9 Jun 2004 18:10:10 -0400 |
User-agent: |
Mutt/1.3.28i |
On Wed, Jun 09, 2004 at 11:34:12PM +0200, Matthieu Moy wrote:
> > BTW, while binary deltas would be very nice for the `ordinary' case, they
> > might be quite dangerous in some other cases -- I at least fairly often
> > apply arch changesets outside the context of just replaying branches, and
> > while the current behavior is not great, at least it results in
> > consistent binary files!
>
> xdelta for example will refuse to apply a patch on a file which is not the
> original. A three way merge approach is not complex (tla will say : I've
> got conflicts, choose between this file and this one), and a standard merge
> will tell you "I'm rejecting this patch" and keep your file unchanged in
> case of conflict. No corrupted files anyway.
Hmmm, the current behavior lets you choose between `old' or `new' files,
though, whereas a failed xdelta would basically mean `you get to choose old'
-- and I suspect that in many (probably the majority of) cases you actually
want `new'.
BTW, can you turn off the text-justification your mail-client seems to be
doing? It's quite annoying to read...
Thanks,
-Miles
--
`...the Soviet Union was sliding in to an economic collapse so comprehensive
that in the end its factories produced not goods but bads: finished products
less valuable than the raw materials they were made from.' [The Economist]
- Re: [Gnu-arch-users] Some issues, (continued)
- Re: [Gnu-arch-users] Some issues, Thomas Bleher, 2004/06/09
- [Gnu-arch-users] Binary diffs (Re: Some issues), Lőrentey Károly, 2004/06/11
- Re: [Gnu-arch-users] Binary diffs (Re: Some issues), Stephen J. Turnbull, 2004/06/12
- [Gnu-arch-users] Re: Binary diffs (Re: Some issues), Lőrentey Károly, 2004/06/14
- Re: [Gnu-arch-users] Re: Binary diffs (Re: Some issues), Stephen J. Turnbull, 2004/06/16
- Re: [Gnu-arch-users] Some issues, Sriram Ramkrishna, 2004/06/09
- synchronicity (was Re: [Gnu-arch-users] Some issues), Matthieu Moy, 2004/06/09
- Re: synchronicity (was Re: [Gnu-arch-users] Some issues), Sriram Ramkrishna, 2004/06/09
- Re: [Gnu-arch-users] Some issues, Miles Bader, 2004/06/09
- Re: [Gnu-arch-users] Some issues, Matthieu Moy, 2004/06/09
- Re: [Gnu-arch-users] Some issues,
Miles Bader <=
- Re: [Gnu-arch-users] Some issues, Sriram Ramkrishna, 2004/06/09
- Re: [Gnu-arch-users] Some issues, Tom Lord, 2004/06/14
- Re: [Gnu-arch-users] Some issues, Michael Poole, 2004/06/14
- Re: [Gnu-arch-users] Some issues, Matthieu Moy, 2004/06/15
- Re: [Gnu-arch-users] Some issues (why no bdiff for Arch), James Blackwell, 2004/06/15
- Re: [Gnu-arch-users] Some issues (why no bdiff for Arch), Matthieu Moy, 2004/06/16
- Re: [Gnu-arch-users] Some issues (why no bdiff for Arch), James Blackwell, 2004/06/18
- [Gnu-arch-users] [BUG] binary files, Tom Lord, 2004/06/15
- Re: [Gnu-arch-users] [BUG] binary files, Matthieu Moy, 2004/06/16
- Re: [Gnu-arch-users] [BUG] binary files, Bug Goo, 2004/06/16