equal
deleted
inserted
replaced
109 |
109 |
110 $ hg up elephant |
110 $ hg up elephant |
111 switching to topic elephant |
111 switching to topic elephant |
112 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
112 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
113 $ hg rebase |
113 $ hg rebase |
114 rebasing 4:cb7ae72f4a80 "babar" (elephant) |
114 rebasing 4:cb7ae72f4a80 "babar" |
115 switching to topic elephant |
115 switching to topic elephant |
116 $ hg log -G |
116 $ hg log -G |
117 @ 7 (elephant) babar |
117 @ 7 (elephant) babar |
118 | |
118 | |
119 o 6 () c_epsilon |
119 o 6 () c_epsilon |
130 |
130 |
131 $ hg up monkey |
131 $ hg up monkey |
132 switching to topic monkey |
132 switching to topic monkey |
133 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
133 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
134 $ hg rebase |
134 $ hg rebase |
135 rebasing 5:d832ddc604ec "zephir" (monkey) |
135 rebasing 5:d832ddc604ec "zephir" |
136 switching to topic monkey |
136 switching to topic monkey |
137 $ hg log -G |
137 $ hg log -G |
138 @ 8 (monkey) zephir |
138 @ 8 (monkey) zephir |
139 | |
139 | |
140 | o 7 (elephant) babar |
140 | o 7 (elephant) babar |
173 o 1 () c_beta |
173 o 1 () c_beta |
174 | |
174 | |
175 o 0 () c_alpha |
175 o 0 () c_alpha |
176 |
176 |
177 $ hg rebase |
177 $ hg rebase |
178 rebasing 9:d79a104e2902 "Huc" (tip monkey) |
178 rebasing 9:d79a104e2902 "Huc" (tip) |
179 $ hg log -G |
179 $ hg log -G |
180 @ 10 (monkey) Huc |
180 @ 10 (monkey) Huc |
181 | |
181 | |
182 o 8 (monkey) zephir |
182 o 8 (monkey) zephir |
183 | |
183 | |
225 |
225 |
226 $ hg up elephant |
226 $ hg up elephant |
227 switching to topic elephant |
227 switching to topic elephant |
228 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
228 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
229 $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere |
229 $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere |
230 rebasing 7:8d0b77140b05 "babar" (elephant) |
230 rebasing 7:8d0b77140b05 "babar" |
231 switching to topic elephant |
231 switching to topic elephant |
232 $ hg up monkey |
232 $ hg up monkey |
233 switching to topic monkey |
233 switching to topic monkey |
234 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
234 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
235 $ hg merge |
235 $ hg merge |
274 $ hg clone jungle other --rev '2' |
274 $ hg clone jungle other --rev '2' |
275 adding changesets |
275 adding changesets |
276 adding manifests |
276 adding manifests |
277 adding file changes |
277 adding file changes |
278 added 3 changesets with 3 changes to 3 files |
278 added 3 changesets with 3 changes to 3 files |
279 new changesets 13ec05df14e1:6482f08916a5 |
|
280 updating to branch default |
279 updating to branch default |
281 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
280 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
282 $ cd other |
281 $ cd other |
283 $ echo other > other |
282 $ echo other > other |
284 $ hg add other |
283 $ hg add other |
288 searching for changes |
287 searching for changes |
289 adding changesets |
288 adding changesets |
290 adding manifests |
289 adding manifests |
291 adding file changes |
290 adding file changes |
292 added 3 changesets with 3 changes to 3 files (+1 heads) |
291 added 3 changesets with 3 changes to 3 files (+1 heads) |
293 new changesets 6f5edd7450bb:c9c03b99196b |
|
294 rebasing 3:dbc48dd9e743 "c_other" |
292 rebasing 3:dbc48dd9e743 "c_other" |
295 $ hg log -G |
293 $ hg log -G |
296 @ 7 () c_other |
294 @ 7 () c_other |
297 | |
295 | |
298 o 6 () c_zeta |
296 o 6 () c_zeta |