| author | Pradeepkumar Gayam <in3xes@gmail.com> |
| Tue, 17 Aug 2010 08:38:31 +0530 | |
| changeset 11940 | 106311e7740f |
| parent 11198 | b345b1cc124f |
| 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 |
@ 4:r1:notdefault |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
4 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
5 |
| o 3:l2: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
6 |
| | |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
7 |
| o 2:l1: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
8 |
|/ |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
9 |
o 1:c2: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
10 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
11 |
o 0:c1: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
12 |
|
|
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 |
% Rebase a branch while preserving the branch name |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
15 |
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
|
16 |
@ 4:r1:notdefault |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
17 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
18 |
o 3:l2: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
19 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
20 |
o 2:l1: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
21 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
22 |
o 1:c2: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
23 |
| |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
24 |
o 0:c1: |
|
3e5db4228f8f
rebase: add support to keep branch names
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
25 |
|
|
8266
609ce91670d0
rebase: fix bug where --keepbranches could leave wrong branch in dirstate
Patrick Mezard <pmezard@gmail.com>
parents:
7468
diff
changeset
|
26 |
% 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
|
27 |
notdefault |