|
4501.3.1
by Ian Clatworthy
first draft of a 2.0 Upgrade Guide |
1 |
Tips and tricks |
2 |
############### |
|
3 |
||
4 |
Finding obsolete branches |
|
5 |
------------------------- |
|
6 |
||
7 |
If you use feature branching for developing each fix |
|
8 |
and enhancement separately, you may have several old |
|
9 |
branches that are no longer required. In many cases, |
|
10 |
the relevant changes may now be merged into trunk. |
|
11 |
In other cases, a branch may be obsolete thanks to |
|
12 |
another change made by yourself or others. |
|
13 |
||
|
4501.3.6
by Ian Clatworthy
Apply review feedback |
14 |
When checking for an obsolete branch, there are three |
|
4501.3.1
by Ian Clatworthy
first draft of a 2.0 Upgrade Guide |
15 |
things in particular to confirm: |
16 |
||
17 |
1. The working tree has no in-progress changes. |
|
18 |
||
|
4501.3.6
by Ian Clatworthy
Apply review feedback |
19 |
2. The working tree has no shelved changes. |
20 |
||
21 |
3. Any locally committed revisions have been merged |
|
|
4501.3.3
by Ian Clatworthy
various tweaks & standalone branch upgrade process |
22 |
into the parent branch. |
|
4501.3.1
by Ian Clatworthy
first draft of a 2.0 Upgrade Guide |
23 |
|
24 |
After changing into the root of a branch, the commands |
|
25 |
to check these things respectively are:: |
|
26 |
||
27 |
bzr status |
|
|
4501.3.6
by Ian Clatworthy
Apply review feedback |
28 |
bzr shelve --list |
|
4501.3.1
by Ian Clatworthy
first draft of a 2.0 Upgrade Guide |
29 |
bzr missing --mine-only |
30 |
||
31 |
If your branches are stored in a shared repository locally, |
|
32 |
you may find the *Local Changes* tab in Bazaar Explorer's |
|
|
4501.3.3
by Ian Clatworthy
various tweaks & standalone branch upgrade process |
33 |
repository view helpful here (revision 159 or later) as it |
|
4501.3.6
by Ian Clatworthy
Apply review feedback |
34 |
shows a summary of these things, excluding the shelve information |
35 |
currently, for each branch as you select it. |