bzr resolve

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12-07-26 02:37 AM, Stephen J. Turnbull wrote:
> Ben Finney writes:
>> Bosco Rama <bzr at boscorama.com> writes:
>> 
>>> It's not the conflicts I was worried about.  It's the ability
>>> to stop a conflicted file from having the 'committed' version
>>> looking like this:
>> 
>> The way to stop that is not to use ‘resolve’ in that case. By
>> using that command, you're telling Bazaar that you know the
>> conflict is resolved, regardless of Bazaar's opinion.
> 
> Then resolve's documentation is buggy.  (In any case, it needs a 
> complete rewrite.[1])  Its description of the command says:
> 
> Once you have fixed a problem, use "bzr resolve" to automatically 
> mark text conflicts as fixed, "bzr resolve FILE" to mark a specific
> conflict as resolved, or "bzr resolve --all" to mark all conflicts
> as resolved.
> 
> That "automatically" strongly suggests some intelligence on the
> part of resolve.

Ben and Bosco are talking about the "resolve FILE" form, not the
no-argument form, but the "automatically" describes the no-argument form.

> Sane behavior for "bzr resolve" with no arguments would be to
> 
> (1) check the tree for files containing conflict markers, (2)
> update the list of conflicted files, and (3) print the list.

That sounds like what it does.

> Footnotes: [1]  (a) All uses of the verb "resolve" should be
> changed to "mark as resolved."

Since merely marking the conflict as resolved is only one of three
possible actions resolve can take, this would be incorrect.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlARPVEACgkQ0F+nu1YWqI21JgCfWUrCwvvu1IMG2K/3WjQ7kIZP
SggAnRoQW0c1JFuTBgOIfDM5gUM5JEb8
=Rw7V
-----END PGP SIGNATURE-----