No reliable way to show shelved changes

2008/12/15 Jonathan Lange <email address hidden>

> Public bug reported:
>
> I can't find a reliable way to show the contents of a shelf.
>
> I found (and lifeless recommended) 'bzr unshelve --dry-run', but that
> doesn't show the contents of the shelf if the shelved patch conflicts
> with the current working tree.
>
> Are there alternatives that I've missed?

``shelve --list``
but thats only in bzr.dev, and would only be released in 1.11

On Mon, Dec 15, 2008 at 7:38 PM, Marius Kruger <email address hidden> wrote:
> 2008/12/15 Jonathan Lange <email address hidden>
>> Are there alternatives that I've missed?
>
> ``shelve --list``
> but thats only in bzr.dev, and would only be released in 1.11

$ bzr version
Bazaar (bzr) 1.11dev
...

$ bzr shelve --list
  2: <no message>
  1: <no message>

That's not what I want. I want to see the *contents* of shelf 2.

jml

This just bit me (bzr 1.15).

Things that I thought logical to try:

bzr diff -c shelf:<shelf id>

bzr unshelve --dry-run -v <shelf id>

bzr unshelve --dry-run <shelf id>

makes sense to me, and seems to be the recommended method. Does that not work at all? I suppose the "doesn't show anything if there is a conflict" would be problematic.

> bzr unshelve --dry-run <shelf id>

> makes sense to me, and seems to be the recommended method. Does that not work at all? I suppose the > "doesn't show anything if there is a conflict" would be problematic.

This gives you merge-like output. i.e. it gives you a list of affected files along with the usual status character to tell you what would happen to the file (M, A, D etc).

This bug is about being able to see the actual diff of the shelved changes, which does not currently appear to be possible.

Also see Bug #317896 which proposes using bzr diff -r shelf:<shelf id>

lp:~salgado/bzr/bug-308122 implements a '--preview' action to the unshelve command, which prints to stdout the diff that would result from unshelving the changes.