equal
deleted
inserted
replaced
128 ---------------- |
128 ---------------- |
129 |
129 |
130 $ hg up -r 'desc(CA)' |
130 $ hg up -r 'desc(CA)' |
131 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
131 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
132 $ hg topic babar |
132 $ hg topic babar |
|
133 marked working directory as topic: babar |
133 $ echo aaa > ddd |
134 $ echo aaa > ddd |
134 $ hg add ddd |
135 $ hg add ddd |
135 $ hg commit -m 'CD' |
136 $ hg commit -m 'CD' |
136 $ hg log -G # keep track of phase because I saw some strange bug during developement |
137 $ hg log -G # keep track of phase because I saw some strange bug during developement |
137 @ 4 default babar draft CD |
138 @ 4 default babar draft CD |
184 ------------------ |
185 ------------------ |
185 |
186 |
186 $ hg up -r 'desc(CA)' |
187 $ hg up -r 'desc(CA)' |
187 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
188 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
188 $ hg topic celeste |
189 $ hg topic celeste |
|
190 marked working directory as topic: celeste |
189 $ echo aaa > eee |
191 $ echo aaa > eee |
190 $ hg add eee |
192 $ hg add eee |
191 $ hg commit -m 'CE' |
193 $ hg commit -m 'CE' |
192 $ hg log -G # keep track of phase because I saw some strange bug during developement |
194 $ hg log -G # keep track of phase because I saw some strange bug during developement |
193 @ 5 default celeste draft CE |
195 @ 5 default celeste draft CE |
272 ---------------------------------------------------- |
274 ---------------------------------------------------- |
273 |
275 |
274 $ hg up 'desc(CB)' |
276 $ hg up 'desc(CB)' |
275 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
277 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
276 $ hg topic babar |
278 $ hg topic babar |
|
279 marked working directory as topic: babar |
277 $ echo aaa > fff |
280 $ echo aaa > fff |
278 $ hg add fff |
281 $ hg add fff |
279 $ hg commit -m 'CF' |
282 $ hg commit -m 'CF' |
280 $ hg log -G |
283 $ hg log -G |
281 @ 6 default babar draft CF |
284 @ 6 default babar draft CF |
377 $ hg add base |
380 $ hg add base |
378 $ hg commit -m 'CBASE' |
381 $ hg commit -m 'CBASE' |
379 $ echo aaa > aaa |
382 $ echo aaa > aaa |
380 $ hg add aaa |
383 $ hg add aaa |
381 $ hg topic topicA |
384 $ hg topic topicA |
|
385 marked working directory as topic: topicA |
382 $ hg commit -m 'CA' |
386 $ hg commit -m 'CA' |
383 $ hg up 'desc(CBASE)' |
387 $ hg up 'desc(CBASE)' |
384 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
388 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
385 $ echo aaa > bbb |
389 $ echo aaa > bbb |
386 $ hg add bbb |
390 $ hg add bbb |
387 $ hg topic topicB |
391 $ hg topic topicB |
|
392 marked working directory as topic: topicB |
388 $ hg commit -m 'CB' |
393 $ hg commit -m 'CB' |
389 $ cd .. |
394 $ cd .. |
390 $ hg push -R repoA repoB |
395 $ hg push -R repoA repoB |
391 pushing to repoB |
396 pushing to repoB |
392 searching for changes |
397 searching for changes |