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' |
|
137 active topic 'babar' grew its first changeset |
136 $ hg log -G # keep track of phase because I saw some strange bug during developement |
138 $ hg log -G # keep track of phase because I saw some strange bug during developement |
137 @ 5 default babar draft CD |
139 @ 5 default babar draft CD |
138 | |
140 | |
139 | o 4 mountain public CC |
141 | o 4 mountain public CC |
140 |/ |
142 |/ |
184 ------------------ |
186 ------------------ |
185 |
187 |
186 $ hg up -r 'desc(CA)' |
188 $ hg up -r 'desc(CA)' |
187 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
189 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
188 $ hg topic celeste |
190 $ hg topic celeste |
|
191 marked working directory as topic: celeste |
189 $ echo aaa > eee |
192 $ echo aaa > eee |
190 $ hg add eee |
193 $ hg add eee |
191 $ hg commit -m 'CE' |
194 $ hg commit -m 'CE' |
|
195 active topic 'celeste' grew its first changeset |
192 $ hg log -G # keep track of phase because I saw some strange bug during developement |
196 $ hg log -G # keep track of phase because I saw some strange bug during developement |
193 @ 6 default celeste draft CE |
197 @ 6 default celeste draft CE |
194 | |
198 | |
195 | o 5 default babar draft CD |
199 | o 5 default babar draft CD |
196 |/ |
200 |/ |
272 ---------------------------------------------------- |
276 ---------------------------------------------------- |
273 |
277 |
274 $ hg up 'desc(CB)' |
278 $ hg up 'desc(CB)' |
275 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
279 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
276 $ hg topic babar |
280 $ hg topic babar |
|
281 marked working directory as topic: babar |
277 $ echo aaa > fff |
282 $ echo aaa > fff |
278 $ hg add fff |
283 $ hg add fff |
279 $ hg commit -m 'CF' |
284 $ hg commit -m 'CF' |
280 $ hg log -G |
285 $ hg log -G |
281 @ 7 default babar draft CF |
286 @ 7 default babar draft CF |
377 $ hg add base |
382 $ hg add base |
378 $ hg commit -m 'CBASE' |
383 $ hg commit -m 'CBASE' |
379 $ echo aaa > aaa |
384 $ echo aaa > aaa |
380 $ hg add aaa |
385 $ hg add aaa |
381 $ hg topic topicA |
386 $ hg topic topicA |
|
387 marked working directory as topic: topicA |
382 $ hg commit -m 'CA' |
388 $ hg commit -m 'CA' |
|
389 active topic 'topicA' grew its first changeset |
383 $ hg up 'desc(CBASE)' |
390 $ hg up 'desc(CBASE)' |
384 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
391 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
385 $ echo aaa > bbb |
392 $ echo aaa > bbb |
386 $ hg add bbb |
393 $ hg add bbb |
387 $ hg topic topicB |
394 $ hg topic topicB |
|
395 marked working directory as topic: topicB |
388 $ hg commit -m 'CB' |
396 $ hg commit -m 'CB' |
|
397 active topic 'topicB' grew its first changeset |
389 $ cd .. |
398 $ cd .. |
390 $ hg push -R repoA repoB |
399 $ hg push -R repoA repoB |
391 pushing to repoB |
400 pushing to repoB |
392 searching for changes |
401 searching for changes |
393 adding changesets |
402 adding changesets |