Mercurial > hg
diff tests/test-push-warn.out @ 11317:b66e414d38b0
commit: fix display of 'created new head' message (issue2186)
To avoid recurrent fixes for the display of this message, a summary table with
all case combinations has been added to the code.
Basically, there is two condition for the message to be printed:
* this is not an initial (named branch or topo) root
* none of the parents are in the current branch heads
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Tue, 08 Jun 2010 22:28:42 +0200 |
parents | e43c23d189a5 |
children | 6381fa7bfa53 |
line wrap: on
line diff
--- a/tests/test-push-warn.out Tue Jun 08 18:01:07 2010 +0200 +++ b/tests/test-push-warn.out Tue Jun 08 22:28:42 2010 +0200 @@ -279,8 +279,10 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch B +created new head 1 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch A +created new head %% glog of local @ 5: A b3 |