Mercurial > hg
comparison tests/test-backout.t @ 44344:ab632e27f296
tests: add `hg log -G` output when there are merge conflicts
The next commit will change the behavior for these. I've used slightly
different commands in the different tests to match the surrounding
style.
Differential Revision: https://phab.mercurial-scm.org/D8042
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 29 Jan 2020 14:42:54 -0800 |
| parents | 99ebde4fec99 |
| children | 14d0e89520a2 |
comparison
equal
deleted
inserted
replaced
| 44343:8561ad49915d | 44344:ab632e27f296 |
|---|---|
| 84 ypples | 84 ypples |
| 85 branch: default | 85 branch: default |
| 86 commit: 1 unresolved (clean) | 86 commit: 1 unresolved (clean) |
| 87 update: (current) | 87 update: (current) |
| 88 phases: 5 draft | 88 phases: 5 draft |
| 89 $ hg log -G | |
| 90 @ changeset: 4:ed99997b793d | |
| 91 | tag: tip | |
| 92 | user: test | |
| 93 | date: Thu Jan 01 00:00:05 1970 +0000 | |
| 94 | summary: ypples | |
| 95 | | |
| 96 o changeset: 3:1c2161e97c0a | |
| 97 | user: test | |
| 98 | date: Thu Jan 01 00:00:04 1970 +0000 | |
| 99 | summary: Backed out changeset 22cb4f70d813 | |
| 100 | | |
| 101 o changeset: 2:a8c6e511cfee | |
| 102 | user: test | |
| 103 | date: Thu Jan 01 00:00:02 1970 +0000 | |
| 104 | summary: grapes | |
| 105 | | |
| 106 o changeset: 1:22cb4f70d813 | |
| 107 | user: test | |
| 108 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 109 | summary: chair | |
| 110 | | |
| 111 o changeset: 0:a5cb2dde5805 | |
| 112 user: test | |
| 113 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 114 summary: tomatoes | |
| 115 | |
| 89 | 116 |
| 90 file that was removed is recreated | 117 file that was removed is recreated |
| 91 (this also tests that editor is not invoked if the commit message is | 118 (this also tests that editor is not invoked if the commit message is |
| 92 specified explicitly) | 119 specified explicitly) |
| 93 | 120 |
| 707 capital ten | 734 capital ten |
| 708 branch: default | 735 branch: default |
| 709 commit: 1 unresolved (clean) | 736 commit: 1 unresolved (clean) |
| 710 update: (current) | 737 update: (current) |
| 711 phases: 3 draft | 738 phases: 3 draft |
| 739 $ hg log -G | |
| 740 @ changeset: 2:b71750c4b0fd | |
| 741 | tag: tip | |
| 742 | user: test | |
| 743 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 744 | summary: capital ten | |
| 745 | | |
| 746 o changeset: 1:913609522437 | |
| 747 | user: test | |
| 748 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 749 | summary: capital three | |
| 750 | | |
| 751 o changeset: 0:a30dd8addae3 | |
| 752 user: test | |
| 753 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 754 summary: initial | |
| 755 | |
| 712 $ hg resolve --all --debug | 756 $ hg resolve --all --debug |
| 713 picked tool ':merge' for foo (binary False symlink False changedelete False) | 757 picked tool ':merge' for foo (binary False symlink False changedelete False) |
| 714 merging foo | 758 merging foo |
| 715 my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 | 759 my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 |
| 716 premerge successful | 760 premerge successful |