On Mon, Sep 22, 2008 at 01:40:37PM -0700, Eric Kow wrote: > Here's that 4th attempt. > The conflict is pretty odd to me, two seemingly unrelated replace patches (no > apparant overlaps). On the surface at least, it seems like they should > commute. > Maybe the reason they conflict would make more sense on further thought... > (for example, they do seem to involve different tokens, which I could believe > to be tricky)
The conflict was because the replace patches weren't consistent about how they define tokens. This is something we don't often think about, but which causes replace patches to conflict with other replace patches. It's just usually not a big deal because hunks are so much more common than replaces. Thanks for the resend, applied! David > Mon Sep 22 13:07:27 BST 2008 Dmitry Kurochkin <[EMAIL PROTECTED]> > * Rename --ignore-unrelated-repos to --allow-unrelated-repos. > Ignore-this: a5990f1741c867316a948e6721118651 > > Mon Sep 22 15:05:20 BST 2008 Eric Kow <[EMAIL PROTECTED]> > * Check for filepath package in configure. > > Mon Sep 22 15:15:32 BST 2008 Eric Kow <[EMAIL PROTECTED]> > * Add --reserved-ok flag for darcs add and mv. > This is just the flag, not the actual effect. > > Mon Sep 22 16:22:56 BST 2008 Eric Kow <[EMAIL PROTECTED]> > * Add test for issue53. > > Mon Sep 22 18:15:19 BST 2008 Eric Kow <[EMAIL PROTECTED]> > * Use --reserved-ok to allow a file with ':' in it in tests. > It's likely that this test will just fail under Windows and > we will have to disable it. > > Mon Sep 22 18:20:04 BST 2008 Eric Kow <[EMAIL PROTECTED]> > * Resolve issue53: check for windows filename validity in darcs add/mv. > > Mon Sep 22 21:26:47 BST 2008 Eric Kow <[EMAIL PROTECTED]> > * Resolve conflict between replace patches in Darcs.Arguments _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
