[darcs-devel] [darcs #481] unrecognized option `--mark-conflicts'

[Zooko via RT]

Tue Aug 02 11:38:23 2005: New ticket: 481.
Transaction: Ticket created by zooko
       Queue: Darcs
     Subject: unrecognized option `--mark-conflicts'
       Owner: Nobody
  Requestors: zooko at zooko.com
      Status: new
 Ticket <URL: http://bugs.darcs.net/.//Ticket/Display.html?id=481 >


This is with 1.0.3 and also with 1.0.4pre2:

Regards,

Zooko

HACK twiddle:/e/zooko/amd/workingdir$ darcs push -a 
darcsfeb641               |        149 kB | 150.0 kB/s | ETA: 00:00:00 | 100%

darcs failed:  Refusing to apply patches leading to conflicts.
If you would rather apply the patch and mark the conflicts,
use the --mark-conflicts option to apply.
Pushing to "zooko at 192.168.1.110:work/newnewtailorfrom770/working"...
There are conflicts in the following files:
./trunk/amdlib/net/herder.py

HACK twiddle:/e/zooko/amd/workingdir$ darcs push -a --mark-conflicts

darcs failed:  unrecognized option `--mark-conflicts'

HACK twiddle:/e/zooko/amd/workingdir$