comparison tests/test-topic-tutorial.t @ 5829:671b9beb471e mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 14:07:39 +0800
parents 669270305ccb fd039a7f0c3c
children be8f7eb3f3a0 b1d010b2e6c4
comparison
equal deleted inserted replaced
5762:669270305ccb 5829:671b9beb471e
47 > EOF 47 > EOF
48 #if docgraph-ext 48 #if docgraph-ext
49 $ . "$TESTDIR/testlib/docgraph_setup.sh" #rest-ignore 49 $ . "$TESTDIR/testlib/docgraph_setup.sh" #rest-ignore
50 #endif 50 #endif
51 51
52 Topic branches are lightweight branches which disappear when changes are 52 Topic branches are lightweight branches which fade out when changes are
53 finalized (moved to the public phase). They can help users to organize and share 53 finalized (moved to the public phase). They can help users to organize and share
54 their unfinished work. 54 their unfinished work.
55 55
56 In this tutorial, we explain how to use topics for local development. In the 56 In this tutorial, we explain how to use topics for local development. In the
57 first part, there is a central *publishing* server. Anything pushed to the 57 first part, there is a central *publishing* server. Anything pushed to the
587 o 3:6104862e8b84 587 o 3:6104862e8b84
588 | Adding clothes 588 | Adding clothes
589 o 0:38da43f0a2ea 589 o 0:38da43f0a2ea
590 Shopping list 590 Shopping list
591 591
592 The topic information will disappear when we publish the changesets: 592 The topic information will fade out when we publish the changesets:
593 593
594 $ hg topics 594 $ hg topics
595 * food (2 changesets) 595 * food (2 changesets)
596 596
597 $ hg push 597 $ hg push
1111 adding manifests 1111 adding manifests
1112 adding file changes 1112 adding file changes
1113 added 2 changesets with 2 changes to 1 files 1113 added 2 changesets with 2 changes to 1 files
1114 2 new obsolescence markers 1114 2 new obsolescence markers
1115 1115
1116 The published topic has now disappeared, and the other is now marked as 1116 The published topic has now faded out, and the other is now marked as
1117 "behind": 1117 "behind":
1118 1118
1119 $ hg topics --verbose 1119 $ hg topics --verbose
1120 * tools (on branch: default, 3 changesets, 2 behind) 1120 * tools (on branch: default, 3 changesets, 2 behind)
1121 1121