Mercurial > hg-git

annotate tests/test-conflict-2.t @ 1144:c9ba526e82d6 default tip master

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added signature for changeset c651bb6fcf33
author Kevin Bullock <kbullock@ringworld.org>
date Sun, 14 Oct 2018 21:43:45 -0500
parents 89303af1c4aa
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
575
a7da97e69d56 tests: extract extension configuration into a testutil library
David M. Carr <david@carrclan.us>
parents: 566
diff changeset
1 Load commonly used test logic
a7da97e69d56 tests: extract extension configuration into a testutil library
David M. Carr <david@carrclan.us>
parents: 566
diff changeset
2 $ . "$TESTDIR/testutil"
a7da97e69d56 tests: extract extension configuration into a testutil library
David M. Carr <david@carrclan.us>
parents: 566
diff changeset
3
496
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
4 $ hg init hgrepo1
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
5 $ cd hgrepo1
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
6 $ echo A > afile
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
7 $ hg add afile
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
8 $ hg ci -m "origin"
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
9
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
10 $ echo B > afile
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
11 $ hg ci -m "A->B"
405
070f1cfdb80f New tests for round-trip fidelity of merge conflicts resolved using one parent.
Christian Walther <cwalther@gmx.ch>
parents:
diff changeset
12
496
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
13 $ hg up -r0
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
15 $ echo C > afile
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
16 $ hg ci -m "A->C"
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
17 created new head
405
070f1cfdb80f New tests for round-trip fidelity of merge conflicts resolved using one parent.
Christian Walther <cwalther@gmx.ch>
parents:
diff changeset
18
940
93d58b79d816 tests: update for new merge output
Sean Farley <sean@farley.io>
parents: 753
diff changeset
19 $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile' | sed 's/incomplete.*/failed!/'
93d58b79d816 tests: update for new merge output
Sean Farley <sean@farley.io>
parents: 753
diff changeset
20 warning: conflicts.* (re)
496
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
21 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
1103
89303af1c4aa tests: glob out a hint that changed in hg 4.5
Kevin Bullock <kbullock@ringworld.org>
parents: 940
diff changeset
22 use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob)
496
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
23 resolve using second parent
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
24 $ echo B > afile
753
5e2f63e1064c tests: adapt for hg 3.1 output changes
Augie Fackler <raf@durin42.com>
parents: 723
diff changeset
25 $ hg resolve -m afile | egrep -v 'no more unresolved files' || true
496
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
26 $ hg ci -m "merge to B"
405
070f1cfdb80f New tests for round-trip fidelity of merge conflicts resolved using one parent.
Christian Walther <cwalther@gmx.ch>
parents:
diff changeset
27
496
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
28 $ hg log --graph --style compact | sed 's/\[.*\]//g'
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
29 @ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
30 |\ merge to B
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
31 | |
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
32 | o 2:0 ea82b67264a1 1970-01-01 00:00 +0000 test
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
33 | | A->C
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
34 | |
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
35 o | 1 7205e83b5a3f 1970-01-01 00:00 +0000 test
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
36 |/ A->B
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
37 |
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
38 o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
39 origin
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
40
405
070f1cfdb80f New tests for round-trip fidelity of merge conflicts resolved using one parent.
Christian Walther <cwalther@gmx.ch>
parents:
diff changeset
41
496
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
42 $ cd ..
405
070f1cfdb80f New tests for round-trip fidelity of merge conflicts resolved using one parent.
Christian Walther <cwalther@gmx.ch>
parents:
diff changeset
43
578
935c4fb1bbfc tests: let git init create directories when applicable
David M. Carr <david@carrclan.us>
parents: 575
diff changeset
44 $ git init --bare gitrepo
528
e48a3f30b73c tests: remove piping of command git init to remove leading path
David M. Carr <david@carrclan.us>
parents: 527
diff changeset
45 Initialized empty Git repository in $TESTTMP/gitrepo/
405
070f1cfdb80f New tests for round-trip fidelity of merge conflicts resolved using one parent.
Christian Walther <cwalther@gmx.ch>
parents:
diff changeset
46
496
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
47 $ cd hgrepo1
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
48 $ hg bookmark -r tip master
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
49 $ hg push -r master ../gitrepo
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
50 pushing to ../gitrepo
550
4bc39fd24db3 push: change "no changes" default output to match normal mercurial
David M. Carr <david@carrclan.us>
parents: 529
diff changeset
51 searching for changes
591
163c452531cf push: add more output about what was added (issue #64)
David M. Carr <david@carrclan.us>
parents: 581
diff changeset
52 adding objects
163c452531cf push: add more output about what was added (issue #64)
David M. Carr <david@carrclan.us>
parents: 581
diff changeset
53 added 4 commits with 3 trees and 3 blobs
496
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
54 $ cd ..
405
070f1cfdb80f New tests for round-trip fidelity of merge conflicts resolved using one parent.
Christian Walther <cwalther@gmx.ch>
parents:
diff changeset
55
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
56 $ hg clone gitrepo hgrepo2 | grep -v '^updating'
496
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
57 importing git objects into hg
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
581
52461f71a782 tests: convert echos to comments
David M. Carr <david@carrclan.us>
parents: 580
diff changeset
59 expect the same revision ids as above
580
6cc99298b69e tests: avoid changing the current directory
David M. Carr <david@carrclan.us>
parents: 579
diff changeset
60 $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g'
496
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
61 @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
62 |\ merge to B
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
63 | |
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
64 | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
65 | | A->B
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
66 | |
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
67 o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
68 |/ A->C
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
69 |
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
70 o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
71 origin
6f599ab7ba06 tests: unify test-conflict-2
David M. Carr <david@carrclan.us>
parents: 442
diff changeset
72