equal
deleted
inserted
replaced
50 #endif |
50 #endif |
51 |
51 |
52 Topic branches are lightweight branches which disappear when changes are |
52 Topic branches are lightweight branches which disappear 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 |
|
56 In this tutorial, we explain how to use topics for local development. There is |
|
57 a central *publishing* server, which means no unfinished work escapes the local |
|
58 repository. |
|
59 |
55 |
60 |
56 Topic Basics |
61 Topic Basics |
57 ============ |
62 ============ |
58 |
63 |
59 Let's say we use Mercurial to manage our shopping list: |
64 Let's say we use Mercurial to manage our shopping list: |
1047 abort: push creates new remote head 70dfa201ed73! |
1052 abort: push creates new remote head 70dfa201ed73! |
1048 (merge or see 'hg help push' for details about pushing new heads) |
1053 (merge or see 'hg help push' for details about pushing new heads) |
1049 [255] |
1054 [255] |
1050 |
1055 |
1051 |
1056 |
1052 Even after a rebase, pushing all active topics at the same time will complain |
1057 Even after a rebase, pushing all active topics at the same time would publish |
1053 about the multiple heads it would create on that branch: |
1058 them to the default branch, and then mercurial would complain about the |
|
1059 multiple *public* heads it would create on that branch: |
1054 |
1060 |
1055 $ hg rebase -b drinks |
1061 $ hg rebase -b drinks |
1056 rebasing 9:8dfa45bd5e0c "Adding apple juice" |
1062 rebasing 9:8dfa45bd5e0c "Adding apple juice" |
1057 merging shopping |
1063 merging shopping |
1058 switching to topic drinks |
1064 switching to topic drinks |