Merge Shelf

Asked by Solti on 2011-09-15

If I made changes to A.txt for feature 1, then I decide to implement feature 2 first.
So I shelf A.txt, revert A.txt to last revision. start making other changes for featuer 2 and then commit.

Now I want to go back to feature 1, I am think I should be able to unshelve A.txt~
how can I first "diff" shelved A.txt and current A.txt? and then merge them?
Is there GUI tool for this functionarity?
For this simple scenario, I don't need "branch", right?

Thanks,
Solti

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Explorer Edit question
Assignee:
No assignee Edit question
Last query:
2011-09-15
Last reply:
2011-09-16
Alexander Belchenko (bialix) said : #1

15.09.2011 20:50, Solti пишет:
> New question #171274 on Bazaar Explorer:
> https://answers.launchpad.net/bzr-explorer/+question/171274
>
> If I made changes to A.txt for feature 1, then I decide to implement feature 2 first.
> So I shelf A.txt, revert A.txt to last revision. start making other changes for featuer 2 and then commit.
>
> Now I want to go back to feature 1, I am think I should be able to unshelve A.txt~
> how can I first "diff" shelved A.txt and current A.txt?

You can't, unfortunately. You can see shelved changes as diff in
qunshelve window.

> and then merge them?

unshelve operation will merge those changes and may produce conflicts,
as usual.

> Is there GUI tool for this functionarity?

qunshelve, available via Explorer.

> For this simple scenario, I don't need "branch", right?

Right.
>

Can you help with this problem?

Provide an answer of your own, or ask Solti for more information if necessary.

To post a message you must log in.