[darcs-devel] [issue436] darcs can silently ignore a conflict

[Edwin]

New submission from Edwin <edwin.thomson at businesswebsoftware.com>:

If I have a pair of patches, one which does a change and one which undoes that
change, they can be pushed together into a repository with a conflicting change
in the same place, silently losing the change in the repo that was pushed to.

Testcase:
mkdir noconflict
cd noconflict
mkdir repo1
cd repo1
darcs init
echo A > f
darcs add f
darcs record --ignore-times -a -m A -A me

cd ..
darcs get repo1 repo2

cd repo1
echo C > f
darcs record --ignore-times -a -m A-C -A me

cd ../repo2
echo B > f
darcs record --ignore-times -a -m A-B -A me
echo A > f
darcs record --ignore-times -a -m B-A -A me

darcs push -a

Now, in repo1, the file contains "A", and "C" has been lost without asking me to
resolve any conflicts.

Edwin

----------
messages: 1592
nosy: EricKow, beschmi, droundy, edwint, tommy
priority: bug
status: unread
title: darcs can silently ignore a conflict

____________________________________
Darcs issue tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue436>
____________________________________