Re: [Gnu-arch-users] Some issues

[Matthieu Moy]

Miles Bader <address@hidden> writes:

> 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.

-- 
Matthieu