[darcs-users] [patch212] Accept issue1819: pull --dont-allow-conflicts doesn't ...

Simon Michael bugs at darcs.net
Tue Sep 14 22:52:17 UTC 2010


Simon Michael <simon at joyful.com> added the comment:

Just a little back-up.. I tried this too and agree with you about the last few lines, I couldn't convince myself they 
are correct. This was easier for me to understand:

cd S
echo | darcs pull --all --dont-allow-conflicts --external-merge 'cp %2 %o' ../R || exit 1
cd ..
rm -rf R S

But when you rename the script to failing-... perhaps it'll be just:

cd S
echo | darcs pull --all --dont-allow-conflicts --external-merge 'cp %2 %o' ../R

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch212>
__________________________________


More information about the darcs-users mailing list