[darcs-devel] Weird conflict (--ssh-cm)

[Eric Y. Kow]

Hi David,

I was trying to pull in my --ssh-cm changes that I had submitted to
stable, and reasonably enough, got a couple of minor conflicts.  Thought
you might want to take a look at this merger:

    hunk ./DarcsArguments.lhs 1091
    merger 0.0 (
    replace ./DarcsArguments.lhs [A-Za-z_0-9] intersection_or_union repo_combinator
    replace ./DarcsArguments.lhs [A-Za-z_0-9\-\.] disable-ssh-cm no-ssh-cm
    )

I don't actually think anything is wrong.  I'm quite willing to accept
that these kinds of things can be counterintuitive sometimes.  Will
likely push the stuff in tomorrow evening unless you say anything.

But I am still rather stunned that these two would conflict.  Is there
an easy explanation?

Sun Feb  4 19:13:01 CET 2007  Kevin Quick <quick at sparq.org>
  * Added --complement to pull to allow "exclusion" repos

-- 
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-devel/attachments/20070310/90631fa4/attachment.pgp