When darcs refuses to push because it would lead to conflicts, darcs
suggests the --mark-conflicts option. Although the hint is for 'apply'
command, it is nevertheless confusing. I was certainly surprised by
the interaction listed below, even though I have been routinely using
darcs for years. One tends to pick out "use the --mark-conflicts
or --allow-conflicts options" from the text and ignore the details. We
are only humans after all...
ben@sarun[1]: .../seq/2-0-98 > darcs push ../work
The remote repository has 4 patches to pull.
Thu Mar 4 10:13:16 CET 2010 benjamin.franksen@bessy.de
tagged R2-0-12
Shall I push this patch? (1/15) [ynWvplxdaqjk], or ? for help: a
darcs failed: Refusing to apply patches leading to conflicts.
If you would rather apply the patch and mark the conflicts,
use the --mark-conflicts or --allow-conflicts options to apply
These can set as defaults by adding
apply mark-conflicts
to _darcs/prefs/defaults in the target repo.
Backing up ./configure/RELEASE(-darcs-backup0)
There are conflicts in the following files:
./configure/RELEASE
Apply failed!
ben@sarun[1]: .../seq/2-0-98 > darcs push ../work --mark-conflicts
darcs failed: unrecognized option `--mark-conflicts'
ben@sarun[1]: .../seq/2-0-98 > darcs push ../work --allow-conflicts
darcs failed: unrecognized option `--allow-conflicts'
|