bzr resolve

[Aaron Bentley]

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

On 12-07-26 01:18 PM, Bosco Rama wrote:
> On 07/26/12 08:59, Aaron Bentley wrote:
>> What is the rationale for specifying FILE when you don't want to 
>> override the automatic behaviour?
> 
> It's more for adherence to the "first, do no harm" precept.  If,
> for example, I fumble-finger a glob: bzr resovle m *.c

What I want to understand is why you're typing the glob in the first
place.  It's not needed if you want the automatic behaviour.

> However, if the resolve command was dangerous in all its forms...

The no-argument form is not dangerous.

> Maybe it's just me but it still feels strange for a system to
> alter a file, flag it as conflicted and then make no attempt to at
> least check that the file's conflicts had been addressed.

But the no-argument form *does* check that the file's contents have
been addressed.  I believe it's what you should be using 99% of the
time.  If the no-argument form is not suitable, please explain why
it's not suitable.

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

iEYEARECAAYFAlARgSQACgkQ0F+nu1YWqI0ijwCfZvW1/XBrysJdItxiN6ROldpu
pc4AnA+vAa8Ifif4UYdrhYyC2A/hg3kK
=Qb2S
-----END PGP SIGNATURE-----