Bazaar Version Control System

No reliable way to show shelved changes

Reported by Jonathan Lange on 2008-12-15
42
This bug affects 7 people
Affects Status Importance Assigned to Milestone
Bazaar
Medium
Guilherme Salgado

Bug Description

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?

Related branches

lp:~salgado/bzr/bug-308122
Merged into lp:bzr
John A Meinel: Approve on 2010-01-12
Martin Pool: Needs Fixing on 2009-12-22

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

Jonathan Lange (jml) wrote :

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

Russ Brown (pickscrape) wrote :

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>

John A Meinel (jameinel) wrote :

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.

Changed in bzr:
importance: Undecided → Medium
status: New → Triaged
Russ Brown (pickscrape) wrote :

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

Tim Powell (theuiguy) wrote :

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

Guilherme Salgado (salgado) wrote :

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.

Changed in bzr:
assignee: nobody → Guilherme Salgado (salgado)
Martin Pool (mbp) on 2010-01-11
Changed in bzr:
status: Triaged → In Progress
Changed in bzr:
status: In Progress → Fix Committed
John A Meinel (jameinel) on 2010-01-21
Changed in bzr:
milestone: none → 2.1.0rc1
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Duplicates of this bug

Other bug subscribers