[darcs-users] David's darcs [Was: Re: darcs patch: ...]
Nicolas Pouillard
nicolas.pouillard at gmail.com
Wed Jul 22 11:19:08 UTC 2009
Excerpts from Petr Rockai's message of Tue Jul 21 18:08:19 +0200 2009:
> Hi,
Hi,
[...]
> The other, more important issue is that neither our nor David's darcs is able
> to merge the repositories in any reasonable time. I gave both about 30 minutes
> of CPU time to try the merge, and also tries a number of simpler pulls without
> any useful results. Moreover, both exhibit the "mergeConflictingNons failed in
> geteff with ix' bug.
I've made the experience and I got the same error as you. But I was doing the
full merge and it was quite quick.
Moreover I think that obliterating some patches that we don't want to pull
like the 'TAG tested' patches can speed up this kind of merges.
--
Nicolas Pouillard
http://nicolaspouillard.fr
More information about the darcs-users
mailing list