equal
deleted
inserted
replaced
5 > |
5 > |
6 > [phases] |
6 > [phases] |
7 > publish=False |
7 > publish=False |
8 > |
8 > |
9 > [alias] |
9 > [alias] |
10 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
10 > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
11 > EOF |
11 > EOF |
12 |
12 |
13 |
13 |
14 $ hg init a |
14 $ hg init a |
15 $ cd a |
15 $ cd a |
33 |
33 |
34 $ sed -e 's/c2/l2/' common > common.new |
34 $ sed -e 's/c2/l2/' common > common.new |
35 $ mv common.new common |
35 $ mv common.new common |
36 $ hg ci -m L2 |
36 $ hg ci -m L2 |
37 |
37 |
|
38 $ hg phase --force --secret 2 |
|
39 |
38 $ hg tglog |
40 $ hg tglog |
39 @ 4: 'L2' |
41 @ 4:draft 'L2' |
40 | |
42 | |
41 o 3: 'L1' |
43 o 3:draft 'L1' |
42 | |
44 | |
43 | o 2: 'C3' |
45 | o 2:secret 'C3' |
44 |/ |
46 |/ |
45 o 1: 'C2' |
47 o 1:draft 'C2' |
46 | |
48 | |
47 o 0: 'C1' |
49 o 0:draft 'C1' |
48 |
50 |
49 |
51 |
50 Conflicting rebase: |
52 Conflicting rebase: |
51 |
53 |
52 $ hg rebase -s 3 -d 2 |
54 $ hg rebase -s 3 -d 2 |
61 $ hg rebase --abort |
63 $ hg rebase --abort |
62 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
64 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
63 rebase aborted |
65 rebase aborted |
64 |
66 |
65 $ hg tglog |
67 $ hg tglog |
66 @ 4: 'L2' |
68 @ 4:draft 'L2' |
67 | |
69 | |
68 o 3: 'L1' |
70 o 3:draft 'L1' |
69 | |
71 | |
70 | o 2: 'C3' |
72 | o 2:secret 'C3' |
71 |/ |
73 |/ |
72 o 1: 'C2' |
74 o 1:draft 'C2' |
73 | |
75 | |
74 o 0: 'C1' |
76 o 0:draft 'C1' |
75 |
77 |
76 $ cd .. |
78 $ cd .. |
77 |
79 |
78 |
80 |
79 Constrcut new repo: |
81 Constrcut new repo: |
102 |
104 |
103 $ echo c1 > c |
105 $ echo c1 > c |
104 $ hg ci -Am C1 |
106 $ hg ci -Am C1 |
105 adding c |
107 adding c |
106 |
108 |
|
109 $ hg phase --force --secret 1 |
|
110 $ hg phase --public 1 |
|
111 |
107 Rebase and abort without generating new changesets: |
112 Rebase and abort without generating new changesets: |
108 |
113 |
109 $ hg tglog |
114 $ hg tglog |
110 @ 4: 'C1' |
115 @ 4:draft 'C1' |
111 | |
116 | |
112 o 3: 'B bis' |
117 o 3:draft 'B bis' |
113 | |
118 | |
114 | o 2: 'C' |
119 | o 2:secret 'C' |
115 | | |
120 | | |
116 | o 1: 'B' |
121 | o 1:public 'B' |
117 |/ |
122 |/ |
118 o 0: 'A' |
123 o 0:public 'A' |
119 |
124 |
120 $ hg rebase -b 4 -d 2 |
125 $ hg rebase -b 4 -d 2 |
121 merging c |
126 merging c |
122 warning: conflicts during merge. |
127 warning: conflicts during merge. |
123 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
128 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
124 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
129 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
125 [255] |
130 [255] |
126 |
131 |
127 $ hg tglog |
132 $ hg tglog |
128 @ 4: 'C1' |
133 @ 4:draft 'C1' |
129 | |
134 | |
130 o 3: 'B bis' |
135 o 3:draft 'B bis' |
131 | |
136 | |
132 | @ 2: 'C' |
137 | @ 2:secret 'C' |
133 | | |
138 | | |
134 | o 1: 'B' |
139 | o 1:public 'B' |
135 |/ |
140 |/ |
136 o 0: 'A' |
141 o 0:public 'A' |
137 |
142 |
138 $ hg rebase -a |
143 $ hg rebase -a |
139 rebase aborted |
144 rebase aborted |
140 |
145 |
141 $ hg tglog |
146 $ hg tglog |
142 @ 4: 'C1' |
147 @ 4:draft 'C1' |
143 | |
148 | |
144 o 3: 'B bis' |
149 o 3:draft 'B bis' |
145 | |
150 | |
146 | o 2: 'C' |
151 | o 2:secret 'C' |
147 | | |
152 | | |
148 | o 1: 'B' |
153 | o 1:public 'B' |
149 |/ |
154 |/ |
150 o 0: 'A' |
155 o 0:public 'A' |
151 |
156 |