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