equal
deleted
inserted
replaced
4 > |
4 > |
5 > [phases] |
5 > [phases] |
6 > publish=False |
6 > publish=False |
7 > |
7 > |
8 > [alias] |
8 > [alias] |
9 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
9 > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" |
10 > EOF |
10 > EOF |
11 |
11 |
12 |
12 |
13 $ hg init a |
13 $ hg init a |
14 $ cd a |
14 $ cd a |
35 $ echo r2 > r2 |
35 $ echo r2 > r2 |
36 $ hg ci -Am r2 |
36 $ hg ci -Am r2 |
37 adding r2 |
37 adding r2 |
38 |
38 |
39 $ hg tglog |
39 $ hg tglog |
40 @ 4: 'r2' |
40 @ 4: 225af64d03e6 'r2' |
41 | |
41 | |
42 o 3: 'r1' |
42 o 3: 8d0a8c99b309 'r1' |
43 | |
43 | |
44 | o 2: 'l1' |
44 | o 2: 87c180a611f2 'l1' |
45 |/ |
45 |/ |
46 o 1: 'c2' |
46 o 1: 56daeba07f4b 'c2' |
47 | |
47 | |
48 o 0: 'c1' |
48 o 0: e8faad3d03ff 'c1' |
49 |
49 |
50 Rebase with no arguments - single revision in source branch: |
50 Rebase with no arguments - single revision in source branch: |
51 |
51 |
52 $ hg up -q -C 2 |
52 $ hg up -q -C 2 |
53 |
53 |
54 $ hg rebase |
54 $ hg rebase |
55 rebasing 2:87c180a611f2 "l1" |
55 rebasing 2:87c180a611f2 "l1" |
56 saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg (glob) |
56 saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg (glob) |
57 |
57 |
58 $ hg tglog |
58 $ hg tglog |
59 @ 4: 'l1' |
59 @ 4: b1152cc99655 'l1' |
60 | |
60 | |
61 o 3: 'r2' |
61 o 3: 225af64d03e6 'r2' |
62 | |
62 | |
63 o 2: 'r1' |
63 o 2: 8d0a8c99b309 'r1' |
64 | |
64 | |
65 o 1: 'c2' |
65 o 1: 56daeba07f4b 'c2' |
66 | |
66 | |
67 o 0: 'c1' |
67 o 0: e8faad3d03ff 'c1' |
68 |
68 |
69 $ cd .. |
69 $ cd .. |
70 |
70 |
71 |
71 |
72 $ hg init b |
72 $ hg init b |
94 $ hg ci -Am r1 |
94 $ hg ci -Am r1 |
95 adding r1 |
95 adding r1 |
96 created new head |
96 created new head |
97 |
97 |
98 $ hg tglog |
98 $ hg tglog |
99 @ 4: 'r1' |
99 @ 4: 8d0a8c99b309 'r1' |
100 | |
100 | |
101 | o 3: 'l2' |
101 | o 3: 1ac923b736ef 'l2' |
102 | | |
102 | | |
103 | o 2: 'l1' |
103 | o 2: 87c180a611f2 'l1' |
104 |/ |
104 |/ |
105 o 1: 'c2' |
105 o 1: 56daeba07f4b 'c2' |
106 | |
106 | |
107 o 0: 'c1' |
107 o 0: e8faad3d03ff 'c1' |
108 |
108 |
109 Rebase with no arguments - single revision in target branch: |
109 Rebase with no arguments - single revision in target branch: |
110 |
110 |
111 $ hg up -q -C 3 |
111 $ hg up -q -C 3 |
112 |
112 |
114 rebasing 2:87c180a611f2 "l1" |
114 rebasing 2:87c180a611f2 "l1" |
115 rebasing 3:1ac923b736ef "l2" |
115 rebasing 3:1ac923b736ef "l2" |
116 saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg (glob) |
116 saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg (glob) |
117 |
117 |
118 $ hg tglog |
118 $ hg tglog |
119 @ 4: 'l2' |
119 @ 4: 023181307ed0 'l2' |
120 | |
120 | |
121 o 3: 'l1' |
121 o 3: 913ab52b43b4 'l1' |
122 | |
122 | |
123 o 2: 'r1' |
123 o 2: 8d0a8c99b309 'r1' |
124 | |
124 | |
125 o 1: 'c2' |
125 o 1: 56daeba07f4b 'c2' |
126 | |
126 | |
127 o 0: 'c1' |
127 o 0: e8faad3d03ff 'c1' |
128 |
128 |
129 |
129 |
130 $ cd .. |
130 $ cd .. |