Commit 46b52093 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

tests: spell out hg parents

See previous commit for the rationale.
parent b68789e8c535
......@@ -98,7 +98,7 @@ Testing when same parent, no conflict:
$ hg evolve -l
$ hg par
$ hg parents
changeset: 4:f7c1071f1e7c
tag: tip
parent: 1:5f6d8a4bf34a
......@@ -190,7 +190,7 @@ Testing when different parent, no conflict:
$ hg evolve -l
$ hg par
$ hg parents
changeset: 5:e800202333a4
tag: tip
parent: 2:155349b645be
......@@ -296,7 +296,7 @@ Testing when same parent, merging conflict:
$ hg evolve -l
$ hg par
$ hg parents
changeset: 4:f7c1071f1e7c
tag: tip
parent: 1:5f6d8a4bf34a
......@@ -401,7 +401,7 @@ Testing when different parent, relocation conflict:
$ hg evolve -l
$ hg par
$ hg parents
changeset: 5:e800202333a4
tag: tip
parent: 2:155349b645be
......@@ -504,7 +504,7 @@ Testing when different parent, merging conflict:
$ hg evolve -l
$ hg par
$ hg parents
changeset: 5:e800202333a4
tag: tip
parent: 2:155349b645be
......@@ -621,7 +621,7 @@ Testing when different parent, conflict in relocation and merging:
$ hg evolve -l
$ hg par
$ hg parents
changeset: 5:e800202333a4
tag: tip
parent: 2:155349b645be
......
......@@ -482,7 +482,7 @@ update to obsoleted revision and perform prune on unrelated revision:
$ hg prune -r "desc('added c')"
1 changesets pruned
$ hg par
$ hg parents
1:5f6d8a4bf34a[] (obsolete/draft) added b
working directory parent is obsolete! (5f6d8a4bf34a)
(use 'hg evolve' to update to its parent successor)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment