Hi Eric, Christian. On Tue, Nov 25, 2008 at 2:23 PM, Eric Kow <[EMAIL PROTECTED]> wrote: > Hi Dmitry, > > On Tue, Nov 25, 2008 at 12:19:30 +0100, Christian Kellermann wrote: >> This patch solves issue1199 by not looking for additions when >> resolving a conflict by an external merge tool. Trent confirmed >> that this solves the issue and he will kindly provide the test case >> for it. > > Any chance you could have a look and confirm this is a safe place to > remove LookForAdds?
Look fine to me. We merge files one by one and specify which file should contain the final merged version. So there is no reason for darcs to look for added files. Regards, Dmitry > > Thanks! > > -- > Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> > PGP Key ID: 08AC04F9 > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.9 (GNU/Linux) > > iEYEARECAAYFAkkr4BkACgkQBUrOwgisBPnRYQCdFUlN2VJ9UJc8G13hGyoWer7o > QxkAnjKtfp09IJL+lmroyOzqYkMWzNE7 > =r3Bt > -----END PGP SIGNATURE----- > > _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
