[darcs-devel] [darcs #558] Don't allow 'record' for files with
unresolved conflicts
via RT
bugs at darcs.net
Tue Oct 18 08:29:23 PDT 2005
Tue Oct 18 11:29:22 2005: New ticket: 558.
Transaction: Ticket created by guest
Queue: Darcs
Subject: Don't allow 'record' for files with unresolved conflicts
Owner: Nobody
Requestors: b.wheeler at ulcc.ac.uk
Status: new
Ticket <URL: http://bugs.darcs.net/.//Ticket/Display.html?id=558 >
When CVS puts conflict markers into a file, it won't allow that file to
be committed again until the markers have been removed (ie the conflict
has, one hopes, been resolved). Any chance of this facility in darcs?
Also of improved markers indicating which patch provided each possible
block, like CVS puts the version numbers in? Thanks.
Cheers,
Ben (using 1.0.3)
PS. Does 'darcs resolve' actually do anything? ;-)
More information about the darcs-devel
mailing list