equal
deleted
inserted
replaced
106 $ hg up elephant |
106 $ hg up elephant |
107 switching to topic elephant |
107 switching to topic elephant |
108 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
108 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
109 $ hg rebase |
109 $ hg rebase |
110 rebasing 4:cb7ae72f4a80 "babar" |
110 rebasing 4:cb7ae72f4a80 "babar" |
|
111 switching to topic elephant |
111 $ hg log -G |
112 $ hg log -G |
112 @ 7 (elephant) babar |
113 @ 7 (elephant) babar |
113 | |
114 | |
114 o 6 () c_epsilon |
115 o 6 () c_epsilon |
115 | |
116 | |
126 $ hg up monkey |
127 $ hg up monkey |
127 switching to topic monkey |
128 switching to topic monkey |
128 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
129 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
129 $ hg rebase |
130 $ hg rebase |
130 rebasing 5:d832ddc604ec "zephir" |
131 rebasing 5:d832ddc604ec "zephir" |
|
132 switching to topic monkey |
131 $ hg log -G |
133 $ hg log -G |
132 @ 8 (monkey) zephir |
134 @ 8 (monkey) zephir |
133 | |
135 | |
134 | o 7 (elephant) babar |
136 | o 7 (elephant) babar |
135 |/ |
137 |/ |
220 $ hg up elephant |
222 $ hg up elephant |
221 switching to topic elephant |
223 switching to topic elephant |
222 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
224 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
223 $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere |
225 $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere |
224 rebasing 7:8d0b77140b05 "babar" |
226 rebasing 7:8d0b77140b05 "babar" |
|
227 switching to topic elephant |
225 $ hg up monkey |
228 $ hg up monkey |
226 switching to topic monkey |
229 switching to topic monkey |
227 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
230 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
228 $ hg merge |
231 $ hg merge |
229 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
232 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |