evolve: comparison tests/test-topic.t

equal deleted inserted replaced

-:d8b47d961c77
+:cf930521f14d
 Can clear topics
 $ hg topic --rev 9 --clear
 changed topic on 1 changes
 please run hg evolve --rev "not topic()" now
 $ hg log -Gr 'draft() and not obsolete()'
-o  changeset:   11:783930e1d79e
+o  changeset:   11:0beca5ab56c3
 |  tag:         tip
 |  parent:      3:a53952faf762
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     start on fran
 Can add a topic to an existing change
 $ hg topic --rev 11 wat
 changed topic on 1 changes
 please run hg evolve --rev "topic(wat)" now
 $ hg log -Gr 'draft() and not obsolete()'
-o  changeset:   13:d91cd8fd490e
+o  changeset:   13:686a642006db
 |  tag:         tip
 |  topic:       wat
 |  parent:      3:a53952faf762
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     start on fran
 |
-| @  changeset:   12:d9e32f4c4806
+| @  changeset:   12:18b70b8de1f0
 | |  user:        test
 | |  date:        Thu Jan 01 00:00:00 1970 +0000
 | |  trouble:     unstable
 | |  summary:     fran?
 | |
 Normally you'd do this with evolve, but we'll use rebase to avoid
 bonus deps in the testsuite.
 $ hg rebase -d tip -s .
-rebasing 12:d9e32f4c4806 "fran?"
+rebasing 12:18b70b8de1f0 "fran?"
 $ hg log -Gr 'draft()'
-@  changeset:   14:cf24ad8bbef5
+@  changeset:   14:503497a14c3e
 |  tag:         tip
 |  topic:       wat
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     fran?
 |
-o  changeset:   13:d91cd8fd490e
+o  changeset:   13:686a642006db
 |  topic:       wat
 |  parent:      3:a53952faf762
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     start on fran
 Amend a topic
 $ hg topic watwat
 $ hg ci --amend
 $ hg log -Gr 'draft()'
-@  changeset:   16:893ffcf66c1f
+@  changeset:   16:024d9c69f30f
 |  tag:         tip
 |  topic:       watwat
-|  parent:      13:d91cd8fd490e
+|  parent:      13:686a642006db
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     fran?
 |
-o  changeset:   13:d91cd8fd490e
+o  changeset:   13:686a642006db
 |  topic:       wat
 |  parent:      3:a53952faf762
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     start on fran
 Clear and amend:
 $ hg topic --clear
 $ hg ci --amend
 $ hg log -r .
-changeset:   18:a13639e22b65
+changeset:   18:573ab57c6de2
 tag:         tip
-parent:      13:d91cd8fd490e
+parent:      13:686a642006db
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     fran?
 Reading the same topic with topic --rev should work:
 Testing issue5441
 $ hg co 19
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg log -Gr 'draft()'
-@  changeset:   19:b72b86a1f96b
+@  changeset:   19:2539ecb09b37
 |  tag:         tip
 |  topic:       watwat
-|  parent:      13:d91cd8fd490e
+|  parent:      13:686a642006db
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     fran?
 |
-o  changeset:   13:d91cd8fd490e
+o  changeset:   13:686a642006db
 |  topic:       wat
 |  parent:      3:a53952faf762
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     start on fran
 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()'
-@  changeset:   21:58e15a6365ca
+@  changeset:   21:993d145391f5
 |  tag:         tip
 |  topic:       changewat
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     fran?
 |
-o  changeset:   20:a96ac830b62e
+o  changeset:   20:ceba5be9d56f
 |  topic:       changewat
 |  parent:      3:a53952faf762
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     start on fran
 $ 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
+@  changeset:   22:0d3d805542b4
 |  tag:         tip
 |  topic:       changewat
-|  parent:      20:a96ac830b62e
+|  parent:      20:ceba5be9d56f
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     gamma
 |
-| o  changeset:   21:58e15a6365ca
+| o  changeset:   21:993d145391f5
 |/   topic:       changewat
 |    user:        test
 |    date:        Thu Jan 01 00:00:00 1970 +0000
 |    summary:     fran?
 |
-o  changeset:   20:a96ac830b62e
+o  changeset:   20:ceba5be9d56f
 |  topic:       changewat
 |  parent:      3:a53952faf762
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     start on fran
 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()'
-@  changeset:   25:05d1bf93e1d8
+@  changeset:   25:729ed5717393
 |  tag:         tip
 |  topic:       changewut
-|  parent:      23:1f668635e0c2
+|  parent:      23:62e49f09f883
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     gamma
 |
-| o  changeset:   24:696f1024fbfb
+| o  changeset:   24:658ae31a0c05
 |/   topic:       changewut
 |    user:        test
 |    date:        Thu Jan 01 00:00:00 1970 +0000
 |    summary:     fran?
 |
-o  changeset:   23:1f668635e0c2
+o  changeset:   23:62e49f09f883
 |  topic:       changewut
 |  parent:      3:a53952faf762
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     start on fran

changeset 2649	cf930521f14d
parent 2648	d8b47d961c77
child 2661	914757c70217