[darcs-users] Problems with conflicts

Neil Mitchell ndmitchell at gmail.com
Mon Mar 6 16:14:42 UTC 2006


Hi,

The Yhc repository has been stored in darcs for some time now, and we
keep running into problems:

The repo is at: http://www.cs.york.ac.uk/fp/darcs/yhc-devel/

The patch that I currently want to apply is at:
http://www-users.cs.york.ac.uk/~ndm/temp/weekend3.patch.gz

Using the following darcs:
ndm at venice:~/temp/yhc-devel$ darcs --exact-version
darcs compiled on Mar  3 2006, at 15:45:25
# configured Tue Feb 28 07:02:39 EST 2006
./configure --no-create --no-recursion

Context:

[TAG 1.0.6
Tommy Pettersson <ptp at lysator.liu.se>**20060228111841]

And the following sequences of commands:
darcs get <url of repo>
wget <patch>
gunzip weekend3.patch.gz
darcs apply weekend3.patch

works fine.

Now when I do:
darcs push /n/www/cs/fp/darcs/yhc-devel/

(which is the same directory as the pull was from) I get the error
that there are conflicts and I need to do --mark-conflicts. Obviously,
since this is the main repo, I don't really want to do that! Also
since I did a fresh get only minutes ago (and can guarantee noone
updated in the meantime) I don't understand how conflicts are arising.

On a friends machine, using darcs 1.0.4, he gets the mark conflicts
warning immediately when applying, he tried with --mark-conflicts and
no conflicts were marked.

The patch was created on a windows machine with darcs send -o weekend3.patch

Does anyone know what might be going wrong?

Thanks

Neil




More information about the darcs-users mailing list