On Sun, Oct 09, 2005 at 05:47:45AM +1100, Netocrat wrote: > David Roundy wrote: > [...] > >This is a bit odd. Is this a repository that you can make available? > > I've temporarily placed it at: > > http://members.dodo.com.au/~netocrat/fish
Thanks! The problem is that the external resolution code assumes that the repository from which you are pulling is itself free from conflicts. In this case you aren't resolving a conflict between your local repository and the remote one, but rather a conflict that's already present in the remote repository. This is a possibility that we don't handle in the external resolve code, since the interface only allows for two versions plus an ancestor being passed to the external handler. It seems natural that one of those versions would be the remove one and one would be the local version. -- David Roundy http://www.darcs.net _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
