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 2646 b5723184fc62
parent 2643 a9ca94defc29
child 2648 d8b47d961c77 
--- a/tests/test-topic.t	Wed Jun 21 11:55:45 2017 +0200
+++ b/tests/test-topic.t	Wed Jun 21 07:21:50 2017 +0530
@@ -707,3 +707,73 @@
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     start on fran
   |
+
+Case with branching:
+
+  $ hg up changewat
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg up t1
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo gamma >> gamma
+  $ hg ci -m gamma
+  $ hg log -Gr 'draft()'
+  @  changeset:   22:373f490f8854
+  |  tag:         tip
+  |  topic:       changewat
+  |  parent:      20:a96ac830b62e
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     gamma
+  |
+  | o  changeset:   21:58e15a6365ca
+  |/   topic:       changewat
+  |    user:        test
+  |    date:        Thu Jan 01 00:00:00 1970 +0000
+  |    summary:     fran?
+  |
+  o  changeset:   20:a96ac830b62e
+  |  topic:       changewat
+  |  parent:      3:a53952faf762
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     start on fran
+  |
+  $ hg topics --rev 't1::' changewut
+  changed topic on 3 changes
+  please run hg evolve --rev "topic(changewut)" now
+  $ hg log -Gr 'draft()'
+  o  changeset:   25:05d1bf93e1d8
+  |  tag:         tip
+  |  topic:       changewut
+  |  parent:      23:1f668635e0c2
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     gamma
+  |
+  | o  changeset:   24:696f1024fbfb
+  |/   topic:       changewut
+  |    user:        test
+  |    date:        Thu Jan 01 00:00:00 1970 +0000
+  |    summary:     fran?
+  |
+  o  changeset:   23:1f668635e0c2
+  |  topic:       changewut
+  |  parent:      3:a53952faf762
+  |  user:        test
+  |  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