Mercurial > evolve
changeset 2971:222ad649380b
topics/tuto: clarification on the scope of the tutorial
Also we try to remain the reader that push -> publish.
| author | Aurélien Campéas |
|---|---|
| date | Thu, 21 Sep 2017 16:25:58 +0200 |
| parents | 19e20e86a514 |
| children | 33efe3a1be37 |
| files | tests/test-topic-tutorial.t |
| diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t Thu Sep 21 15:27:20 2017 +0200 +++ b/tests/test-topic-tutorial.t Thu Sep 21 16:25:58 2017 +0200 @@ -53,6 +53,11 @@ finalized (moved to the public phase). They can help users to organize and share their unfinished work. +In this tutorial, we explain how to use topics for local development. There is +a central *publishing* server, which means no unfinished work escapes the local +repository. + + Topic Basics ============ @@ -1049,8 +1054,9 @@ [255] -Even after a rebase, pushing all active topics at the same time will complain -about the multiple heads it would create on that branch: +Even after a rebase, pushing all active topics at the same time would publish +them to the default branch, and then mercurial would complain about the +multiple *public* heads it would create on that branch: $ hg rebase -b drinks rebasing 9:8dfa45bd5e0c "Adding apple juice"