QBzr

Merge lp://qastaging/~kvilhaugsvik/qbzr/qshelve_all into lp://qastaging/qbzr

  1. qshelve_all
  2. Merge into trunk2a
Proposed by Sveinung Kvilhaugsvik
Status: Merged
Approved by: Alexander Belchenko
Approved revision: 1517
Merged at revision: 1514
Proposed branch: lp://qastaging/~kvilhaugsvik/qbzr/qshelve_all
Merge into: lp://qastaging/qbzr
Diff against target: 113 lines (+24/-5)
4 files modified
NEWS.txt (+6/-0)
lib/commands.py (+6/-2)
lib/shelvewindow.py (+4/-2)
lib/widgets/shelve.py (+8/-1)
To merge this branch: bzr merge lp://qastaging/~kvilhaugsvik/qbzr/qshelve_all
Reviewer Review Type Date Requested Status
Alexander Belchenko Approve
Review via email: mp+186682@code.qastaging.launchpad.net

Description of the change

Add the option --all to qshelve so it acts a bit more like shelve.

To post a comment you must log in.
Revision history for this message
Sveinung Kvilhaugsvik (kvilhaugsvik) wrote :

It appears that -m also was missing.

Revision history for this message
Alexander Belchenko (bialix) wrote :

Thank you for your patch.
Mostly looks good, although I'd prefer that you added all new parameters to the end of arguments list in functions (__init__ and other). This is kind of backward compatibility, I try to follow this pattern. If you don't mind to change it I'd be grateful.
Also we need some text about changes in NEWS.txt. Can you provide some?

review: Needs Fixing
Revision history for this message
Sveinung Kvilhaugsvik (kvilhaugsvik) wrote :

Erm... I messed up my history. Sorry for the noise.

Revision history for this message
Alexander Belchenko (bialix) wrote :

Use command
bzr heads --dead
to find your lost revisions. You need revision-id. It has form like <user@host-datestamp-random>. You need this revision id.
Then do
bzr pull . -r <your-lost-revision-id>
And you will restore your history.

Revision history for this message
Alexander Belchenko (bialix) wrote :

I suppose your last revision was
HEAD: revision-id: <email address hidden> (dead)
  committer: Sveinung Kvilhaugsvik <email address hidden>
  branch nick: 1233909
  timestamp: Tue 2013-10-15 15:10:17 +0200
  message:
    Add NEWS entry about "qshelve -m"

Your dead revision id therefore
<email address hidden>
So you can do
bzr pull . -r revid:<email address hidden>
After you restore your branch do `bzr push --overwrite` to launchpad.

Revision history for this message
Sveinung Kvilhaugsvik (kvilhaugsvik) wrote :

Fixed. I didn't loose it. I merged in a way that made it lie. (The previous version had the data from your commit today but didn't list it as a parent)

Revision history for this message
Alexander Belchenko (bialix) wrote :

Many thanks for your changes! I'll merge it.

review: Approve
Revision history for this message
Sveinung Kvilhaugsvik (kvilhaugsvik) wrote :

Great! Thanks for your help!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches