[MERGE/RFC] Revert reporting #3707

[John Arbash Meinel]

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

Aaron Bentley wrote:
> John Arbash Meinel wrote:


I'll look over the rest later, but I have a few quick responses.

>> Certainly, whatever format we decide on should work for 'bzr status
>> > --short' as well as 'bzr revert', 'bzr update', 'bzr merge', 'bzr pull'.
>> >
>> > Until now, we've always treated those as printing the log of the merged
>> > revisions,
> 
> I don't know what you mean by this.
> 

Whatever format we chose to use for 'bzr revert' should also be used for
other commands that modify the working tree. Currently 'bzr pull -v'
only prints the log of revisions merged, but it would make sense for it
to also print how the tree changed.

...


> Well, as I noted in my previous email,
> 
>>>>  - they have no way to represent a 'kind' change

Just add a 'K' in place of 'M', since Kind supersedes Modified.

>>>>  - they don't differentiate between 'renamed' and 'renamed and modified'.

Actually, it does. I don't know if you saw the output but it was:
% bzr st
added:
  b
renamed:
  b => c
modified:
  c
% bzr status --short
A  b
R  b => c
M  c

So if a file was renamed and modified it gets 2 lines.
R  b => c # file was renamed to c
M  c      # file c was also modified


>>>>  - they can't indicate file versioning operations separately from file
>>>> creation/deletion
> 
> Aaron

Well, I don't think it really should, but maybe... I suppose 'bzr merge'
or 'bzr revert' could indicate this, but I don't think 'bzr status' can
without writing out more information.

Certainly if I do 'bzr add X', that will always be an add without a
create, since X already existed or you couldn't run add it. But in your
logical model, that should probably be both an add plus a create.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFpXvtJdeBCYSNAAMRAhHyAKCfjYGdPCortEK5/xHTYqM8TbKo1ACaApxv
juT5+F+6QRk1bAE2a+OId7g=
=R+Ua
-----END PGP SIGNATURE-----