| author | Matt Mackall <mpm@selenic.com> |
| Thu, 08 Oct 2009 01:17:24 -0500 | |
| changeset 9570 | 7cea12e70129 |
| parent 8266 | 609ce91670d0 |
| child 11173 | 5b48d819d5f9 |
| permissions | -rw-r--r-- |
|
7468
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
1 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
2 |
marked working directory as branch notdefault |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
3 |
created new head |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
4 |
@ 4:r1:notdefault |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
5 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
6 |
| o 3:l2: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
7 |
| | |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
8 |
| o 2:l1: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
9 |
|/ |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
10 |
o 1:c2: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
11 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
12 |
o 0:c1: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
13 |
|
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
14 |
|
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
15 |
% Rebase a branch while preserving the branch name |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
16 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
17 |
saving bundle to |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
18 |
adding branch |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
19 |
adding changesets |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
20 |
adding manifests |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
21 |
adding file changes |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
22 |
added 1 changesets with 1 changes to 1 files |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
23 |
rebase completed |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
24 |
@ 4:r1:notdefault |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
25 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
26 |
o 3:l2: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
27 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
28 |
o 2:l1: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
29 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
30 |
o 1:c2: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
31 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
32 |
o 0:c1: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
33 |
|
|
8266
609ce91670d0
rebase: fix bug where --keepbranches could leave wrong branch in dirstate
Patrick Mezard <pmezard@gmail.com>
parents:
7468
diff
changeset
|
34 |
% dirstate branch should be "notdefault" |
|
609ce91670d0
rebase: fix bug where --keepbranches could leave wrong branch in dirstate
Patrick Mezard <pmezard@gmail.com>
parents:
7468
diff
changeset
|
35 |
notdefault |