bzr unshelve --dry-run should produce a diff
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned |
Bug Description
I love that bzr 1.11 has shelf builtin, however unshelve is a bit less convenient that it could be.
My use case: I have a working tree with shelved changes and i want to delete the directory, but i don't yet know whether i want to save the shelved changes or not. I'd like to view the diff and then possibly save it off in a patch file somewhere else.
There appears to be no way to do this with bzr unshelve. abentley states in irc that he expected 'bzr unshelve --dry-run' to do this, and i do too, but it doesn't. --dry-run just shows you the list of files that would be touched in the merge operation, not the actual changes. Even adding -v doesn't help.
(The workaround of course is to do the unshelve, and then diff as normal, reverting if necessary, but that's suboptimal.)
Related branches
- John A Meinel: Approve
- Martin Pool: Needs Fixing
-
Diff: 173 lines (+67/-6)3 files modifiedbzrlib/builtins.py (+2/-0)
bzrlib/shelf_ui.py (+32/-6)
bzrlib/tests/test_shelf_ui.py (+33/-0)
Changed in bzr: | |
importance: | Undecided → Medium |
tags: | added: affects-emacs |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Barry Warsaw wrote:
> Public bug reported:
> There appears to be no way to do this with bzr unshelve. abentley
> states in irc that he expected 'bzr unshelve --dry-run' to do this, and
> i do too, but it doesn't. --dry-run just shows you the list of files
> that would be touched in the merge operation, not the actual changes.
> Even adding -v doesn't help.
What would you think if the command was bzr diff -r shelved:1?
Doing it that way allows other diff options to be supplied.
Aaron enigmail. mozdev. org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkl 1GA0ACgkQ0F+ nu1YWqI1BTQCfVj n/oeJOT7E+ FJ+fnxrq0LJL 708xr8XbdbUgRtG D6
6K4AnR26680dbww
=mv6Q
-----END PGP SIGNATURE-----