[darcs-users] --mark-conflicts

[Eric Y. Kow]

Hi Rubn,

Unfortunately, the error messages here are somewhat misleading.

In short, you cannot push a conflicting patch (this is by design; all
conflicts should stay at home!).  However, you could do a darcs pull
--mark-conflicts to retrieve the conflicting patch, correct it on your
end and then do a darcs push.

Alternately, (less cleanly), you could do a darcs apply --mark-conflicts
on the other end (you would have to save the patch files with darcs
send).  This is what darcs push does, as a matter of fact. It saves the
patches into a file and does a darcs apply.  It is the darcs apply that
is complaining about the conflict, not so much darcs push itself.

It would be worthwhile for us to work on making this error message less
confusing somehow.

-- 
Eric Kow                     http://www.loria.fr/~kow
PGP Key ID: 08AC04F9         Merci de corriger mon français.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 186 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20070620/c5ab140c/attachment.pgp