> 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.
> 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.