[darcs-users] darcs patch: resolve issue1043: fix bug in mergeAfterConflicting.

[Eric Kow]

Here is my latest progress in boiling down Florent's example.

We're down to a single 10 line file and two bundles to apply (with a
total of three patches).

I may not have time to actually turn this into a proper test case
tomorrow, but I think we are very close now, if anybody wants to
work out a shell script from this...

P.S. While this may have been a total waste of time, it's given a
slightly better feel for darcs, conflictors, etc, which maybe is a good
thing.

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9
-------------- next part --------------
A non-text attachment was scrubbed...
Name: issue1043_example_reduced.tgz
Type: application/x-tar-gz
Size: 3163 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20080930/3beb6196/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 194 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20080930/3beb6196/attachment.pgp