bzr resolve

[Stephen J. Turnbull]

Ben Finney writes:

 > I think (and perhaps Stephen agrees) that a lot of the confusion
 > stems From this mixture of semantically conflicting actions under a
 > single command.

Actually I hadn't thought about it that way.

Even on reflection, I don't have a problem with interpreting "bzr
resolve" as "hey, Bazaar, do ACTION for me and mark the conflict as
resolved for committing purposes" where ACTION might be "take the
original file from my working tree," "take the original file from the
incoming branch," or "don't touch, just mark (I've done all the
work)."  "Resolve" is an active, transitive verb (more or less), after
all.  So IMO YMMV I don't have a problem with it.

In general, ACTION might even be something more complex (like, "do a
Darcs-like patch algebra analysis and back out the conflicting
incoming changeset").  But "do nothing" is always an option for manual
resolution.

Really, it's just that I would like my VCS to double-check for me in
cases where the check is trivial and reasonably efficient, a false
negative is at best very annoying and at worst hideously embarrassing,
while a false positive is mildly annoying and trivially resolved.