bzr resolve

[Aaron Bentley]

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

On 12-07-26 04:38 PM, Bosco Rama wrote:
> On 07/26/12 13:23, Aaron Bentley wrote:
>> On 12-07-26 03:13 PM, Bosco Rama wrote:
>>> bzr resolve vs bzr resolve *
>> 
>>> Logically the same.  VERY different outcome.
>> 
>> Thanks for explaining your rationale.  There are a number of 
>> counter-examples to the idea that these are logically the same.
> 
> Well, sort of.  They act drastically differently depending on the 
> target -- benignly in one case and destructively in the other.
> Your counter-examples either act consistently on the targets or
> error out.

Some of counter-examples error out: gunzip/gzip, chown, chmod, rm and
"bzr ignore" error out.  The rest have different behaviour:

no-argument "cat" reads from stdin
no-argument "grep" reads from stdin
no-argument "ls -a" lists all files in the pwd, while ls -a * lists
the contents of the directories, as well.
no-argument "wc" reads from stdin

bzr add:
 with *, all un-added files are added
 no-argument form ignores ignored files

bzr remove:
 with *, removes all files
 no-argument form un-adds any files that have been deleted manually

bzr log:
 with *, ignore entries that altered no files, or that altered files
  that have since been deleted.
 no-argument form lists all entries

bzr revert:
 with *, does not clear pending merges
 no-argument form clears pending merges

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

iEYEARECAAYFAlARtWUACgkQ0F+nu1YWqI2cbwCeKTe/203zt2a6Tf0ZTaULJEBp
YbEAn3mO1ZcDZTfp0ZPifWOwHtaE6eBY
=ZPHj
-----END PGP SIGNATURE-----