Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-topic.t
changeset 2648 d8b47d961c77
parent 2646 b5723184fc62
child 2649 cf930521f14d 
--- a/tests/test-topic.t	Wed Jun 21 13:21:08 2017 +0200
+++ b/tests/test-topic.t	Wed Jun 21 13:18:47 2017 +0200
@@ -653,6 +653,8 @@
   
 Reading the same topic with topic --rev should work:
   $ hg topic --rev . watwat
+  switching to topic watwat
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   changed topic on 1 changes
 
 Testing issue5441
@@ -676,10 +678,12 @@
   |
 
   $ hg topics --rev '13::19' changewat
+  switching to topic changewat
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   changed topic on 2 changes
   please run hg evolve --rev "topic(changewat)" now
   $ hg log -Gr 'draft()'
-  o  changeset:   21:58e15a6365ca
+  @  changeset:   21:58e15a6365ca
   |  tag:         tip
   |  topic:       changewat
   |  user:        test
@@ -693,20 +697,6 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     start on fran
   |
-  | @  changeset:   19:b72b86a1f96b
-  | |  topic:       watwat
-  | |  parent:      13:d91cd8fd490e
-  | |  user:        test
-  | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  summary:     fran?
-  | |
-  | x  changeset:   13:d91cd8fd490e
-  |/   topic:       wat
-  |    parent:      3:a53952faf762
-  |    user:        test
-  |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    summary:     start on fran
-  |
 
 Case with branching:
 
@@ -739,10 +729,12 @@
   |  summary:     start on fran
   |
   $ hg topics --rev 't1::' changewut
+  switching to topic changewut
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   changed topic on 3 changes
   please run hg evolve --rev "topic(changewut)" now
   $ hg log -Gr 'draft()'
-  o  changeset:   25:05d1bf93e1d8
+  @  changeset:   25:05d1bf93e1d8
   |  tag:         tip
   |  topic:       changewut
   |  parent:      23:1f668635e0c2
@@ -763,17 +755,3 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     start on fran
   |
-  | @  changeset:   22:373f490f8854
-  | |  topic:       changewat
-  | |  parent:      20:a96ac830b62e
-  | |  user:        test
-  | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  summary:     gamma
-  | |
-  | x  changeset:   20:a96ac830b62e
-  |/   topic:       changewat
-  |    parent:      3:a53952faf762
-  |    user:        test
-  |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    summary:     start on fran
-  |
evolve