changeset 2012:dc34d5317001

doc: add more details about the head checking Once again, probably not great, but better than nothing.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 13 Sep 2016 17:58:22 +0200
parents 9c7665e3107b
children 2e8e4619a240
files hgext3rd/topic/__init__.py
diffstat 1 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py	Wed Sep 07 12:45:23 2016 +0200
+++ b/hgext3rd/topic/__init__.py	Tue Sep 13 17:58:22 2016 +0200
@@ -27,12 +27,21 @@
 The 'stack' will show you in formation about the stack of commit belonging to
 your current topic.
 
-In addition, topic is offering your aliases reference to changeset in your
-current topic stack as 't#'. For example, 't1' refers to the root of your
-stack, 't2' to the second commits, etc. The 'hg stack' command show these
-number.
+Topic is offering you aliases reference to changeset in your current topic
+stack as 't#'. For example, 't1' refers to the root of your stack, 't2' to the
+second commits, etc. The 'hg stack' command show these number.
 
-Finally, the 'evolve' extension takes 'topic' into account. 'hg evolve --all'
+Push behavior will change a bit with topic. When pushing to a publishing
+repository the changesets will turn public and the topic data on them will fade
+away. The logic regarding pushing new heads will behave has before, ignore any
+topic related data. When pushing to a non-publishing repository (supporting
+topic), the head checking will be done taking topic data into account.
+Push will complain about multiple heads on a branch if you push multiple heads
+with no topic information on them (or multiple public heads). But pushing a new
+topic will not requires any specific flag. However, pushing multiple heads on a
+topic will be met with the usual warning.
+
+The 'evolve' extension takes 'topic' into account. 'hg evolve --all'
 will evolve all changesets in the active topic. In addition, by default. 'hg
 next' and 'hg prev' will stick to the current topic.