Comment 1 for bug 403687

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 403687] [NEW] bzr status should show shelved changes

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

Tim Powell wrote:
> Public bug reported:
>
> It's difficult to know when there are shelved changes in a working tree
> unless you explicitly use bzr shelf list. It feels like it would be
> better to show files which have shelved changes using the bzr status
> command. A shelved change is conceptually a special type of "modified"
> file.

Which set of shelved changes would you use to decide whether to
indicated it as modified?

Would you consider the case where shelved changes have already been
applied to the working tree, meaning that unshelving would not change
the file, despite there being shelved changes for that file?

I think it makes sense for status to indicate when there are shelved
changes, but that doesn't mean it should be done on a per-file basis.
Just "3 sets of changes have been shelved" would remind people of the
shelved changes.

> This fits in with Bug #330311 which desires a way to unshelve by
> filename. In many cases I want to know which files have shelved changes,
> but shelve wants to show me the changeset/patch/diff instead.
>
> Shelf groups a set of changes as with a normal revision, but confusingly
> acts quite differently. Shouldn't a shelf act like any other revision?

A shelf is more like a working tree than a revision. The format
supports all working tree states, including unversioned files. So no,
it's not a revision, and it shouldn't act like one.

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

iEYEARECAAYFAkpovB8ACgkQ0F+nu1YWqI0/lgCeIs8DpORAh4YHgKH18LkvSFsC
LccAn3ncRvpv+HpIdOMx5kwbEdy1pJEe
=vxPB
-----END PGP SIGNATURE-----