D8042: tests: add `hg log -G` output when there are merge conflicts
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Jan 30 00:57:17 UTC 2020
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The next commit will change the behavior for these. I've used slightly
different commands in the different tests to match the surrounding
style.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D8042
AFFECTED FILES
tests/test-backout.t
tests/test-strip.t
tests/test-update-branches.t
CHANGE DETAILS
diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -249,6 +249,19 @@
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
+ $ hg log -G --template '{rev}:{node|short} {parents} {branches}\n'
+ o 5:ff252e8273df b1
+ |
+ @ 4:d047485b3896 0:60829823a42a b1
+ |
+ | o 3:6efa171f091b 1:0786582aa4b1
+ | |
+ | | o 2:bd10386d478c
+ | |/
+ | o 1:0786582aa4b1
+ |/
+ o 0:60829823a42a
+
$ hg st
M a
? a.orig
diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -591,6 +591,18 @@
phases: 2 draft
mq: 3 unapplied
+ $ hg log --graph
+ @ changeset: 1:76dcf9fab855
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: b
+ |
+ o changeset: 0:9ab35a2d17cb
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: a
+
$ echo c > b
$ hg strip tip
abort: uncommitted changes
diff --git a/tests/test-backout.t b/tests/test-backout.t
--- a/tests/test-backout.t
+++ b/tests/test-backout.t
@@ -86,6 +86,33 @@
commit: 1 unresolved (clean)
update: (current)
phases: 5 draft
+ $ hg log -G
+ @ changeset: 4:ed99997b793d
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:05 1970 +0000
+ | summary: ypples
+ |
+ o changeset: 3:1c2161e97c0a
+ | user: test
+ | date: Thu Jan 01 00:00:04 1970 +0000
+ | summary: Backed out changeset 22cb4f70d813
+ |
+ o changeset: 2:a8c6e511cfee
+ | user: test
+ | date: Thu Jan 01 00:00:02 1970 +0000
+ | summary: grapes
+ |
+ o changeset: 1:22cb4f70d813
+ | user: test
+ | date: Thu Jan 01 00:00:01 1970 +0000
+ | summary: chair
+ |
+ o changeset: 0:a5cb2dde5805
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: tomatoes
+
file that was removed is recreated
(this also tests that editor is not invoked if the commit message is
@@ -709,6 +736,23 @@
commit: 1 unresolved (clean)
update: (current)
phases: 3 draft
+ $ hg log -G
+ @ changeset: 2:b71750c4b0fd
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: capital ten
+ |
+ o changeset: 1:913609522437
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: capital three
+ |
+ o changeset: 0:a30dd8addae3
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: initial
+
$ hg resolve --all --debug
picked tool ':merge' for foo (binary False symlink False changedelete False)
merging foo
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list