On Thu, Aug 09, 2007 at 09:53:36PM +0200, Eric Y. Kow wrote:
> > I guess this is the long-standing hard-to-fix merger bug that will
> > disappear with the change to cancellation patches?
>
> Ouch. This one? http://bugs.darcs.net/issue279
Yep, that one.
> > I'm working around it by pulling patches via temporary repos to avoid
> > the failing merger commutation.
>
> Users might be interested in an explanation of that.
Well, it is more like trial and error. The problem is there is a
pair of patches that darcs fails to commute in some order. So I
make a Tmp repo that doesn't contain them, or contain them in
the "right" order, and pull Src->Tmp->Dst. For the
stable-unstable case the offending patches are:
Sun Jul 22 21:32:23 CEST 2007 Eric Kow <[EMAIL PROTECTED]>
* Fix conflicts with Kevin Quick's [DarcsRepo] stuff.
Mon Jul 30 00:54:10 CEST 2007 Tommy Pettersson <[EMAIL PROTECTED]>
* resolv issue490 fix in stable (will conflict with resolv in unstable)
Mon Jul 30 22:42:20 CEST 2007 Eric Kow <[EMAIL PROTECTED]>
* Resolve the expected conflict with 'resolv issue490 fix'
Two of these ('conflicts with Kevin' and 'issue490 fix in
stable') are already in darcs-stable. At least one of them can't
be commuted with:
Sun Jul 8 13:26:18 CEST 2007 Eric Kow <[EMAIL PROTECTED]>
* Fix issue490 conflicts.
If I pull 'Fix issue490 conflicts' to stable (via Tmp),
everything seems to start working again.
--
Tommy Pettersson <[EMAIL PROTECTED]>
_______________________________________________
darcs-devel mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-devel
