Mercurial > evolve
diff tests/test-topic.t @ 2624:fd602980f7ee
topics: make sure we commit on new parents while changing topics (issue5441)
While changing topics of a set of linear commits, we used to commit our new
changesets with new topic on parents of its predecessor i.e. changeset before
the topic change. If the topic of parent was also changed, that parent will
become obsolete and hence resulting the cnew commit in unstable state. For a set
of linear commits this repeats and we end up in a tree state as mentioned in the
bug.
This patch fixes the bug by checking whether the parent was obsoleted and if
yes, commit on the new parent.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 18 Jun 2017 03:23:46 +0530 |
| parents | a263f4c0f2ee |
| children | a9ca94defc29 |
line wrap: on
line diff
--- a/tests/test-topic.t Sun Jun 18 03:20:52 2017 +0530 +++ b/tests/test-topic.t Sun Jun 18 03:23:46 2017 +0530 @@ -679,30 +679,28 @@ changed topic on 2 changes please run hg evolve --rev "topic(changewat)" now $ hg log -Gr 'draft()' - o changeset: 21:3c7d84fcabcd + o changeset: 21:58e15a6365ca | tag: tip | topic: changewat - | parent: 13:d91cd8fd490e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable | summary: fran? | - | o changeset: 20:a96ac830b62e - | | topic: changewat - | | parent: 3:a53952faf762 + o changeset: 20:a96ac830b62e + | topic: changewat + | parent: 3:a53952faf762 + | user: test + | 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: start on fran + | | summary: 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 + | x changeset: 13:d91cd8fd490e |/ topic: wat | parent: 3:a53952faf762 | user: test