On Sat, Nov 19, 2005 at 11:14:03PM -0500, Lst Recv wrote: > I attempted to do a darcs push, which failed, due to conflicts.
You should sync with the remote repo by Pulling from it. That will generate the same conflict, but darcs will allow it, and it will be in your local repo where you have a chance of resolving it. Then pushing the patch that resolves the conflict along with the patch that causes the conflict, will not cause a conflict in the remote repo, and succeed. > To fix the conflicts, I manually uploaded the current version of the > conflicting files. That has the same result as manually making the same changes in the remote repo, but without recording them. Now you have unrecorded changes in the remote repo. > I tried pushing again, darcs hung. Yes, you tried to Pushed some changes you had recorded in your local repo. However, there are already some unrecorded changes in the remote repo (the ones you brought there by the uploaded files) that will conflict with the changes you Push. In fact, they are almost the exact same changes, so probably every one of them conflicts. Plus there is already another conflict with some patch in the remote repo, the one darcs complained about before you uploaded the files manually. All in all there is a very bad merge situation, and it takes quite a while for darcs to compute it. > I did a darcs record on the remote repository, and then a darcs check Now you have two different patches with almost the same changes. One recorded in your local repo and one recorded in the remote repo. They are slightly different because the one in the remote repo is based on some change that is obviously not in your local repo (a change that is conflicting with your patch in the local repo). > (repo was OK), tried pushing again (several times) - darcs just hangs. Darcs isn't hanging, it is figuring out if it can merge these two megaconflicting patches that both wants to change the same lines everywhere. If you wait long enough darcs will conclude that it can't, and will refuse the Push. I hope this helps clearing out a thing or two. If not, just ask again. There are also good explanations of this and much more in the manual (somewhere...). -- Tommy Pettersson <[EMAIL PROTECTED]> _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
