This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8042

tests: add `hg log -G` output when there are merge conflicts
ClosedPublic

Authored by martinvonz on Jan 29 2020, 7:56 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGab632e27f296: tests: add `hg log -G` output when there are merge conflicts
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-backout.t (44 lines)
Mtests/test-strip.t (12 lines)
Mtests/test-update-branches.t (13 lines)

Diff 20134

tests/test-backout.t

[1] [1]
$ hg summary $ hg summary
parent: 4:ed99997b793d tip parent: 4:ed99997b793d tip
ypples ypples
branch: default branch: default
commit: 1 unresolved (clean) commit: 1 unresolved (clean)
update: (current) update: (current)
phases: 5 draft 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 file that was removed is recreated
(this also tests that editor is not invoked if the commit message is (this also tests that editor is not invoked if the commit message is
specified explicitly) specified explicitly)
$ cd .. $ cd ..
$ hg init remove $ hg init remove
$ cd remove $ cd remove
U foo U foo
$ hg summary $ hg summary
parent: 2:b71750c4b0fd tip parent: 2:b71750c4b0fd tip
capital ten capital ten
branch: default branch: default
commit: 1 unresolved (clean) commit: 1 unresolved (clean)
update: (current) update: (current)
phases: 3 draft 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 $ hg resolve --all --debug
picked tool ':merge' for foo (binary False symlink False changedelete False) picked tool ':merge' for foo (binary False symlink False changedelete False)
merging foo merging foo
my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
premerge successful premerge successful
(no more unresolved files) (no more unresolved files)
continue: hg commit continue: hg commit
$ hg status $ hg status

tests/test-strip.t

parent: 1:76dcf9fab855 tip parent: 1:76dcf9fab855 tip
b b
branch: default branch: default
commit: 1 modified, 1 unknown, 1 unresolved commit: 1 modified, 1 unknown, 1 unresolved
update: (current) update: (current)
phases: 2 draft phases: 2 draft
mq: 3 unapplied 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 $ echo c > b
$ hg strip tip $ hg strip tip
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ hg strip tip --keep $ hg strip tip --keep
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
$ hg log --graph $ hg log --graph
@ changeset: 0:9ab35a2d17cb @ changeset: 0:9ab35a2d17cb

tests/test-update-branches.t

$ hg co -qC 3 $ hg co -qC 3
$ echo dirty >> a $ echo dirty >> a
$ hg co --tool :merge3 4 $ hg co --tool :merge3 4
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [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 $ hg st
M a M a
? a.orig ? a.orig
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# a # a
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE