[darcs-users] how to produce conflicts in pending

Peter Maxwell peter.maxwell at anu.edu.au
Sun Nov 30 01:15:27 UTC 2003

Moving a file before adding its new directory:

T=`TMPDIR=$PWD mktemp -d`
echo $T
cd $T
set -e
darcs inittree
echo text > afile.txt
darcs add afile.txt
darcs record --all --no-test --patch-name init
mkdir d
darcs mv afile.txt d/afile.txt
darcs add d
darcs record --all --no-test --patch-name second

Successfully initialized tree!
Finished recording patch 'init'
Yikes, pending has conflicts!
Yikes, pending has conflicts!
Unable to apply patch!

More information about the darcs-users mailing list