Mercurial > evolve
comparison tests/test-topic.t @ 3914:96945ea908df stable
branching: merge default into stable
The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 31 Jul 2018 12:52:06 +0200 |
| parents | dda5b2134b32 |
| children | 5940e586efd9 54eade86ac31 |
comparison
equal
deleted
inserted
replaced
| 3901:f2b8429db565 | 3914:96945ea908df |
|---|---|
| 276 Add commits to topic | 276 Add commits to topic |
| 277 | 277 |
| 278 $ echo topic work >> alpha | 278 $ echo topic work >> alpha |
| 279 $ hg ci -m 'start on narf' | 279 $ hg ci -m 'start on narf' |
| 280 active topic 'narf' grew its first changeset | 280 active topic 'narf' grew its first changeset |
| 281 (see 'hg help topics' for more information) | |
| 281 $ hg co .^ | 282 $ hg co .^ |
| 282 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 283 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 283 $ hg topic fran | 284 $ hg topic fran |
| 284 marked working directory as topic: fran | 285 marked working directory as topic: fran |
| 285 $ hg topics | 286 $ hg topics |
| 288 $ hg topics --current | 289 $ hg topics --current |
| 289 fran | 290 fran |
| 290 $ echo >> fran work >> beta | 291 $ echo >> fran work >> beta |
| 291 $ hg ci -m 'start on fran' | 292 $ hg ci -m 'start on fran' |
| 292 active topic 'fran' grew its first changeset | 293 active topic 'fran' grew its first changeset |
| 294 (see 'hg help topics' for more information) | |
| 293 $ hg co narf | 295 $ hg co narf |
| 294 switching to topic narf | 296 switching to topic narf |
| 295 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 297 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 296 $ hg topic | 298 $ hg topic |
| 297 fran (1 changesets) | 299 fran (1 changesets) |
| 445 $ echo what >> alpha | 447 $ echo what >> alpha |
| 446 $ hg topic query | 448 $ hg topic query |
| 447 marked working directory as topic: query | 449 marked working directory as topic: query |
| 448 $ hg ci -m 'what is narf, pinky?' | 450 $ hg ci -m 'what is narf, pinky?' |
| 449 active topic 'query' grew its first changeset | 451 active topic 'query' grew its first changeset |
| 452 (see 'hg help topics' for more information) | |
| 450 $ hg log -Gl2 | 453 $ hg log -Gl2 |
| 451 @ changeset: 5:c01515cfc331 | 454 @ changeset: 5:c01515cfc331 |
| 452 | tag: tip | 455 | tag: tip |
| 453 | topic: query | 456 | topic: query |
| 454 | user: test | 457 | user: test |
| 530 narf | 533 narf |
| 531 query | 534 query |
| 532 tip | 535 tip |
| 533 $ hg phase --public narf | 536 $ hg phase --public narf |
| 534 active topic 'narf' is now empty | 537 active topic 'narf' is now empty |
| 538 (use 'hg topic --clear' to clear it if needed) | |
| 535 | 539 |
| 536 POSSIBLE BUG: narf topic stays alive even though we just made all | 540 POSSIBLE BUG: narf topic stays alive even though we just made all |
| 537 narf commits public: | 541 narf commits public: |
| 538 | 542 |
| 539 $ hg topics | 543 $ hg topics |
| 591 adding changesets | 595 adding changesets |
| 592 adding manifests | 596 adding manifests |
| 593 adding file changes | 597 adding file changes |
| 594 added 3 changesets with 3 changes to 1 files | 598 added 3 changesets with 3 changes to 1 files |
| 595 new changesets 7c34953036d6:ae074045b7a7 | 599 new changesets 7c34953036d6:ae074045b7a7 |
| 600 1 local changesets published | |
| 596 active topic 'query' is now empty | 601 active topic 'query' is now empty |
| 597 (run 'hg update' to get a working copy) | 602 (run 'hg update' to get a working copy) |
| 598 $ hg topics | 603 $ hg topics |
| 599 * query (0 changesets) | 604 * query (0 changesets) |
| 600 | 605 |
| 830 | 835 |
| 831 $ hg add b | 836 $ hg add b |
| 832 $ hg topic topic1990 | 837 $ hg topic topic1990 |
| 833 $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo" | 838 $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo" |
| 834 active topic 'topic1990' grew its first changeset | 839 active topic 'topic1990' grew its first changeset |
| 840 (see 'hg help topics' for more information) | |
| 835 $ hg add c | 841 $ hg add c |
| 836 $ hg topic topic2010 | 842 $ hg topic topic2010 |
| 837 $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --user "bar" | 843 $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --user "bar" |
| 838 active topic 'topic2010' grew its first changeset | 844 active topic 'topic2010' grew its first changeset |
| 845 (see 'hg help topics' for more information) | |
| 839 | 846 |
| 840 $ hg log -G | 847 $ hg log -G |
| 841 @ changeset: 3:76b16af75125 | 848 @ changeset: 3:76b16af75125 |
| 842 | tag: tip | 849 | tag: tip |
| 843 | topic: topic2010 | 850 | topic: topic2010 |