Hi Everyone I just got a conflict when pulling from another branch:
[...] Backing up ./src/seq/seqPvt.h(.~0~) Backing up ./src/seq/seq_ca.c(.~0~) Backing up ./src/seq/seq_if.c(.~0~) Backing up ./src/seq/seq_main.c(.~0~) We have conflicts in the following files: ./src/seq/seqPvt.h ./src/seq/seq_ca.c ./src/seq/seq_if.c ./src/seq/seq_main.c Three of these files actually contain conflict markers, but the third one (./src/seq/seq_if.c) does not. Even so, most of the changes that I expected to see in the file are not there, so it seems Darcs acted as if I had said --no-mark-conflicts. I then recorded the conflict resolutions for the three files where I got markers and then ran 'darcs mark-conflicts'. This did not make any changes to the file and did not add any conflict markers. The behaviour is the same with "2.9.7 (unknown)" and with 2.8.4. I can provide the two repos in question if it helps to track this down. Should I file a bug report (in the tracker)? Or is there some detail w.r.t. Darcs' conflict handling that I do not understand? Cheers -- "Make it so they have to reboot after every typo." ? Scott Adams _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
