Mercurial > evolve
comparison tests/test-topic-mode.t @ 3924:f3713d41b85b mercurial-4.5
test-compat: merge mercurial-4.6 into mercurial-4.5
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 01:58:44 +0200 |
| parents | eb928f5728c4 |
| children | f76141f3ce80 |
comparison
equal
deleted
inserted
replaced
| 3923:257481642686 | 3924:f3713d41b85b |
|---|---|
| 242 | 242 |
| 243 Test a merge too | 243 Test a merge too |
| 244 | 244 |
| 245 $ hg phase --public -r . | 245 $ hg phase --public -r . |
| 246 active topic 'various-dove' is now empty | 246 active topic 'various-dove' is now empty |
| 247 (use 'hg topic --clear' to clear it if needed) | |
| 248 $ hg up default | 247 $ hg up default |
| 249 clearing empty topic "various-dove" | 248 clearing empty topic "various-dove" |
| 250 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 249 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 251 $ hg log -G | 250 $ hg log -G |
| 252 @ changeset: 2:2d2acb6efad5 | 251 @ changeset: 2:2d2acb6efad5 |
| 306 | 305 |
| 307 Test a merge too | 306 Test a merge too |
| 308 | 307 |
| 309 $ hg phase --public -r . | 308 $ hg phase --public -r . |
| 310 active topic 'various-dove' is now empty | 309 active topic 'various-dove' is now empty |
| 311 (use 'hg topic --clear' to clear it if needed) | |
| 312 $ hg up default | 310 $ hg up default |
| 313 clearing empty topic "various-dove" | 311 clearing empty topic "various-dove" |
| 314 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 312 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 315 $ hg log -G | 313 $ hg log -G |
| 316 @ changeset: 2:2d2acb6efad5 | 314 @ changeset: 2:2d2acb6efad5 |