[darcs-users] David's darcs
Trent W. Buck
twb at cybersource.com.au
Wed Jul 22 01:45:58 UTC 2009
Petr Rockai <me at mornfall.net> writes:
> 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 saw this when I was playing with David's branch a few months ago, and
I should have mentioned it then. Mea culpa!
> There are likely some choices:
Our first action should be to let David know about the above: that his
work can't be merged into Darcs' HEAD without monumental effort (i.e. by
manually importing patches).
> 1. abandon current darcs core altogether
Wasn't this already on the cards for the Darcs 3 migration to camp-core?
> 2. try to fix it ourselves
> 3. try to merge David's work manually (and hope that he eventually
> fixes the bugs in the core we care about)
FYI, I actually did a couple of (3) patches for trivial things last time
I looked at David's repo. Now I think about it, this probably made the
merge problem even worse, sorry!
More information about the darcs-users