[darcs-users] unique features + exponential time issue

[Pekka Pessi]

2007/10/25, Stephen J. Turnbull <stephen at xemacs.org>:
> And you should.

> I would never use a merge tool that didn't signal a conflict in this
> case (and I'm pretty sure Darcs will, btw).

Perhaps you should not use darcs.

~ $ mkdir R1 && cd R1
R1 $ echo alfa > text
R1 $ echo beta >> text
R1 $ echo gamma >> text
R1 $ darcs init
R1 $ darcs add text
R1 $ darcs record -m0 --all
Finished recording patch '0'
R1 $ darcs put ../R2
Finished applying...

R1 $ sed -i s/alfa/alpha/ text
R1 $ darcs record -ma --all
Finished recording patch 'a'
R1 $ cd ../R2/
R2 $ sed -i s/beta/delta/ text
R2 $ darcs record -mb --all
Finished recording patch 'b'
R2 $ darcs pull ../R1/

Thu Oct 25 03:45:32 EEST 2007  Pekka Pessi <first at last.fi>
  * a
Shall I pull this patch? (1/1)  [ynWvpxqadjk], or ? for help: y

Finished pulling and applying.
R2 $ cat text
alpha
delta
gamma
R2 $

Modifying darcs so that it would (optionally) include context in its
patches should not be too hard.

-- 
Pekka.Pessi mail at nokia.com