Mercurial > hg
annotate tests/test-merge-changedelete.t @ 30540:d955cebd8d6a
tests: add test that @commands in debugcommands.py are sorted
I felt like inline Python in test-check-code.t was the most
appropriate place for this, as other linters in contrib/ seem to
be source file agnostic.
The test currently fails.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 25 Nov 2016 09:55:05 -0800 |
parents | ce3a133f71b3 |
children | 7d4ce4b567c5 |
rev | line source |
---|---|
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1 Tests for change/delete conflicts, including: |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12259
diff
changeset
|
2 b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again |
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12259
diff
changeset
|
3 (issue897) |
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12259
diff
changeset
|
4 |
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12259
diff
changeset
|
5 840e2b315c1f: Fix misleading error and prompts during update/merge |
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12259
diff
changeset
|
6 (issue556) |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
7 |
26895
fc41f9ffd4a4
test-merge-prompt.t: unset HGMERGE
Siddharth Agarwal <sid0@fb.com>
parents:
26850
diff
changeset
|
8 Make sure HGMERGE doesn't interfere with the test |
fc41f9ffd4a4
test-merge-prompt.t: unset HGMERGE
Siddharth Agarwal <sid0@fb.com>
parents:
26850
diff
changeset
|
9 $ unset HGMERGE |
fc41f9ffd4a4
test-merge-prompt.t: unset HGMERGE
Siddharth Agarwal <sid0@fb.com>
parents:
26850
diff
changeset
|
10 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
11 $ status() { |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
12 > echo "--- status ---" |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
13 > hg st -A file1 file2 file3 |
27126
72b4e1bf8f28
test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents:
27125
diff
changeset
|
14 > echo "--- resolve --list ---" |
72b4e1bf8f28
test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents:
27125
diff
changeset
|
15 > hg resolve --list file1 file2 file3 |
27136
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
16 > echo "--- debugmergestate ---" |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
17 > hg debugmergestate |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
18 > for file in file1 file2 file3; do |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
19 > if [ -f $file ]; then |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
20 > echo "--- $file ---" |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
21 > cat $file |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
22 > else |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
23 > echo "*** $file does not exist" |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
24 > fi |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
25 > done |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
26 > } |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
27 |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
28 $ hg init repo |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
29 $ cd repo |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
30 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
31 $ echo 1 > file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
32 $ echo 2 > file2 |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
33 $ echo 3 > file3 |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
34 $ hg ci -Am 'added files' |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
35 adding file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
36 adding file2 |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
37 adding file3 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
38 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
39 $ hg rm file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
40 $ echo changed >> file2 |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
41 $ echo changed1 >> file3 |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
42 $ hg ci -m 'removed file1, changed file2, changed file3' |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
43 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
44 $ hg co 0 |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
45 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
46 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
47 $ echo changed >> file1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
48 $ hg rm file2 |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
49 $ echo changed2 >> file3 |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
50 $ hg ci -m 'changed file1, removed file2, changed file3' |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
51 created new head |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
52 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
53 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
54 Non-interactive merge: |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
55 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
56 $ hg merge -y |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
57 local [working copy] changed file1 which other [merge rev] deleted |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
58 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
59 other [merge rev] changed file2 which local [working copy] deleted |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
60 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
61 merging file3 |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
62 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
63 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
64 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
65 [1] |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
66 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
67 $ status |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
68 --- status --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
69 M file2 |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
70 M file3 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
71 C file1 |
27126
72b4e1bf8f28
test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents:
27125
diff
changeset
|
72 --- resolve --list --- |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
73 U file1 |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
74 U file2 |
27126
72b4e1bf8f28
test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents:
27125
diff
changeset
|
75 U file3 |
27136
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
76 --- debugmergestate --- |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
77 * version 2 records |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
78 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
79 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
80 labels: |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
81 local: working copy |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
82 other: merge rev |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
83 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
84 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
85 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
86 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
87 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
88 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
89 file: file2 (record type "C", state "u", hash null) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
90 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
91 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
92 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
93 file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27136
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
94 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
95 local path: file3 (flags "") |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
96 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
97 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
98 --- file1 --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
99 1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
100 changed |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
101 --- file2 --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
102 2 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
103 changed |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
104 --- file3 --- |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
105 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
106 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
107 changed2 |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
108 ======= |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
109 changed1 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
110 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
111 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
112 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
113 Interactive merge: |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
114 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
115 $ hg co -C |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
116 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28011
diff
changeset
|
117 1 other heads for branch "default" |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
118 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
119 $ hg merge --config ui.interactive=true <<EOF |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
120 > c |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
121 > d |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
122 > EOF |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
123 local [working copy] changed file1 which other [merge rev] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
124 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
125 other [merge rev] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
126 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
127 merging file3 |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
128 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
129 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
130 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
131 [1] |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
132 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
133 $ status |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
134 --- status --- |
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
12365
diff
changeset
|
135 file2: * (glob) |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
136 M file3 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
137 C file1 |
27126
72b4e1bf8f28
test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents:
27125
diff
changeset
|
138 --- resolve --list --- |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
139 R file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
140 R file2 |
27126
72b4e1bf8f28
test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents:
27125
diff
changeset
|
141 U file3 |
27136
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
142 --- debugmergestate --- |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
143 * version 2 records |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
144 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
145 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
146 labels: |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
147 local: working copy |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
148 other: merge rev |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
149 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
150 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
151 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
152 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
153 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
154 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
155 file: file2 (record type "C", state "r", hash null) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
156 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
157 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
158 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
159 file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27136
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
160 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
161 local path: file3 (flags "") |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
162 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
163 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
164 --- file1 --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
165 1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
166 changed |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
167 *** file2 does not exist |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
168 --- file3 --- |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
169 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
170 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
171 changed2 |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
172 ======= |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
173 changed1 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
174 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
175 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
176 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
177 Interactive merge with bad input: |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
178 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
179 $ hg co -C |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
180 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28011
diff
changeset
|
181 1 other heads for branch "default" |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
182 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
183 $ hg merge --config ui.interactive=true <<EOF |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
184 > foo |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
185 > bar |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
186 > d |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
187 > baz |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
188 > c |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
189 > EOF |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
190 local [working copy] changed file1 which other [merge rev] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
191 use (c)hanged version, (d)elete, or leave (u)nresolved? foo |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
18543
diff
changeset
|
192 unrecognized response |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
193 local [working copy] changed file1 which other [merge rev] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
194 use (c)hanged version, (d)elete, or leave (u)nresolved? bar |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
18543
diff
changeset
|
195 unrecognized response |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
196 local [working copy] changed file1 which other [merge rev] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
197 use (c)hanged version, (d)elete, or leave (u)nresolved? d |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
198 other [merge rev] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
199 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
18543
diff
changeset
|
200 unrecognized response |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
201 other [merge rev] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
202 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
203 merging file3 |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
204 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
205 0 files updated, 1 files merged, 1 files removed, 1 files unresolved |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
206 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
207 [1] |
5672
8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
208 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
209 $ status |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
210 --- status --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
211 M file2 |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
212 M file3 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
213 R file1 |
27126
72b4e1bf8f28
test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents:
27125
diff
changeset
|
214 --- resolve --list --- |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
215 R file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
216 R file2 |
27126
72b4e1bf8f28
test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents:
27125
diff
changeset
|
217 U file3 |
27136
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
218 --- debugmergestate --- |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
219 * version 2 records |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
220 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
221 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
222 labels: |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
223 local: working copy |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
224 other: merge rev |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
225 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
226 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
227 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
228 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
229 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
230 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
231 file: file2 (record type "C", state "r", hash null) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
232 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
233 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
234 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
235 file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27136
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
236 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
237 local path: file3 (flags "") |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
238 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
239 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
240 *** file1 does not exist |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
241 --- file2 --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
242 2 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
243 changed |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
244 --- file3 --- |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
245 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
246 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
247 changed2 |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
248 ======= |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
249 changed1 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
250 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
251 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
252 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
253 Interactive merge with not enough input: |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
254 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
255 $ hg co -C |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
256 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28011
diff
changeset
|
257 1 other heads for branch "default" |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
258 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
259 $ hg merge --config ui.interactive=true <<EOF |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
260 > d |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
261 > EOF |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
262 local [working copy] changed file1 which other [merge rev] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
263 use (c)hanged version, (d)elete, or leave (u)nresolved? d |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
264 other [merge rev] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
265 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
266 merging file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
267 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
268 0 files updated, 0 files merged, 1 files removed, 2 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
269 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
270 [1] |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
271 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
272 $ status |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
273 --- status --- |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
274 M file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
275 M file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
276 R file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
277 --- resolve --list --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
278 R file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
279 U file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
280 U file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
281 --- debugmergestate --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
282 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
283 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
284 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
285 labels: |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
286 local: working copy |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
287 other: merge rev |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
288 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
289 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
290 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
291 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
292 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
293 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
294 file: file2 (record type "C", state "u", hash null) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
295 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
296 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
297 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
298 file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
299 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
300 local path: file3 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
301 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
302 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
303 *** file1 does not exist |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
304 --- file2 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
305 2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
306 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
307 --- file3 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
308 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
309 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
310 changed2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
311 ======= |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
312 changed1 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
313 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
314 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
315 Choose local versions of files |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
316 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
317 $ hg co -C |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
318 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28011
diff
changeset
|
319 1 other heads for branch "default" |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
320 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
321 $ hg merge --tool :local |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
322 0 files updated, 3 files merged, 0 files removed, 0 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
323 (branch merge, don't forget to commit) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
324 $ status 2>&1 | tee $TESTTMP/local.status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
325 --- status --- |
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
12365
diff
changeset
|
326 file2: * (glob) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
327 M file3 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
328 C file1 |
27126
72b4e1bf8f28
test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents:
27125
diff
changeset
|
329 --- resolve --list --- |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
330 R file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
331 R file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
332 R file3 |
27136
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
333 --- debugmergestate --- |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
334 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
335 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
336 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
337 labels: |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
338 local: working copy |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
339 other: merge rev |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
340 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
341 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
342 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
343 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
344 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
345 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
346 file: file2 (record type "C", state "r", hash null) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
347 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
348 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
349 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
350 file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
351 file: file3 (record type "F", state "r", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
352 local path: file3 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
353 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
354 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
355 --- file1 --- |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
356 1 |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
357 changed |
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
358 *** file2 does not exist |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
359 --- file3 --- |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
360 3 |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
361 changed2 |
12259
7b05cb9ac6d2
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com>
parents:
5672
diff
changeset
|
362 |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
363 Choose other versions of files |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
364 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
365 $ hg co -C |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
366 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28011
diff
changeset
|
367 1 other heads for branch "default" |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
368 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
369 $ hg merge --tool :other |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
370 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
371 (branch merge, don't forget to commit) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
372 $ status 2>&1 | tee $TESTTMP/other.status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
373 --- status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
374 M file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
375 M file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
376 R file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
377 --- resolve --list --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
378 R file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
379 R file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
380 R file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
381 --- debugmergestate --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
382 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
383 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
384 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
385 labels: |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
386 local: working copy |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
387 other: merge rev |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
388 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
389 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
390 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
391 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
392 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
393 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
394 file: file2 (record type "C", state "r", hash null) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
395 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
396 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
397 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
398 file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
399 file: file3 (record type "F", state "r", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
400 local path: file3 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
401 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
402 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
403 *** file1 does not exist |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
404 --- file2 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
405 2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
406 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
407 --- file3 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
408 3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
409 changed1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
410 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
411 Fail |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
412 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
413 $ hg co -C |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
414 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28011
diff
changeset
|
415 1 other heads for branch "default" |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
416 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
417 $ hg merge --tool :fail |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
418 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
419 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
420 [1] |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
421 $ status 2>&1 | tee $TESTTMP/fail.status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
422 --- status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
423 M file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
424 M file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
425 C file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
426 --- resolve --list --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
427 U file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
428 U file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
429 U file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
430 --- debugmergestate --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
431 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
432 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
433 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
434 labels: |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
435 local: working copy |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
436 other: merge rev |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
437 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
438 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
439 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
440 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
441 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
442 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
443 file: file2 (record type "C", state "u", hash null) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
444 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
445 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
446 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
447 file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
448 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
449 local path: file3 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
450 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
451 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
452 --- file1 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
453 1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
454 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
455 --- file2 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
456 2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
457 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
458 --- file3 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
459 3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
460 changed2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
461 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
462 Force prompts with no input (should be similar to :fail) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
463 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
464 $ hg co -C |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
465 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28011
diff
changeset
|
466 1 other heads for branch "default" |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
467 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
468 $ hg merge --config ui.interactive=True --tool :prompt |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
469 local [working copy] changed file1 which other [merge rev] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
470 use (c)hanged version, (d)elete, or leave (u)nresolved? |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
471 other [merge rev] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
472 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
473 no tool found to merge file3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
474 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
475 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
476 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
477 [1] |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
478 $ status 2>&1 | tee $TESTTMP/prompt.status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
479 --- status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
480 M file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
481 M file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
482 C file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
483 --- resolve --list --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
484 U file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
485 U file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
486 U file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
487 --- debugmergestate --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
488 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
489 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
490 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
491 labels: |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
492 local: working copy |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
493 other: merge rev |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
494 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
495 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
496 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
497 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
498 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
499 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
500 file: file2 (record type "C", state "u", hash null) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
501 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
502 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
503 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
504 file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
505 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
506 local path: file3 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
507 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
508 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
509 --- file1 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
510 1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
511 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
512 --- file2 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
513 2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
514 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
515 --- file3 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
516 3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
517 changed2 |
27557
28b5c4fcf48d
tests: Solaris diff -U also emits "No differences encountered"
Danek Duvall <danek.duvall@oracle.com>
parents:
27164
diff
changeset
|
518 $ cmp $TESTTMP/fail.status $TESTTMP/prompt.status || diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
519 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
520 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
521 Force prompts |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
522 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
523 $ hg co -C |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
524 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28011
diff
changeset
|
525 1 other heads for branch "default" |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
526 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
527 $ hg merge --tool :prompt |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
528 local [working copy] changed file1 which other [merge rev] deleted |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
529 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
530 other [merge rev] changed file2 which local [working copy] deleted |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
531 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
532 no tool found to merge file3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
533 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
534 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27163
diff
changeset
|
535 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27163
diff
changeset
|
536 [1] |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
537 $ status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
538 --- status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
539 M file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
540 M file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
541 C file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
542 --- resolve --list --- |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
543 U file1 |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
544 U file2 |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27163
diff
changeset
|
545 U file3 |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
546 --- debugmergestate --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
547 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
548 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
549 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
550 labels: |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
551 local: working copy |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
552 other: merge rev |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
553 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
554 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
555 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
556 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
557 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
558 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
559 file: file2 (record type "C", state "u", hash null) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
560 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
561 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
562 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
563 file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27163
diff
changeset
|
564 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
565 local path: file3 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
566 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
567 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
568 --- file1 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
569 1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
570 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
571 --- file2 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
572 2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
573 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
574 --- file3 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
575 3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
576 changed2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
577 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
578 Choose to merge all files |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
579 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
580 $ hg co -C |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
581 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28011
diff
changeset
|
582 1 other heads for branch "default" |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
583 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
584 $ hg merge --tool :merge3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
585 local [working copy] changed file1 which other [merge rev] deleted |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
586 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
587 other [merge rev] changed file2 which local [working copy] deleted |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
588 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
589 merging file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
590 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
591 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
592 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
593 [1] |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
594 $ status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
595 --- status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
596 M file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
597 M file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
598 C file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
599 --- resolve --list --- |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
600 U file1 |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
601 U file2 |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
602 U file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
603 --- debugmergestate --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
604 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
605 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
606 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
607 labels: |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
608 local: working copy |
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
609 other: merge rev |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
610 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
611 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
612 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
613 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
614 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
615 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
616 file: file2 (record type "C", state "u", hash null) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
617 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
618 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
619 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
620 file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
621 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
622 local path: file3 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
623 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
624 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
625 --- file1 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
626 1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
627 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
628 --- file2 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
629 2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
630 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
631 --- file3 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
632 3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
633 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
634 changed2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
635 ||||||| base |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
636 ======= |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
637 changed1 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
638 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
639 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
640 Exercise transitions between local, other, fail and prompt, and make sure the |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
641 dirstate stays consistent. (Compare with each other and to the above |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
642 invocations.) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
643 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
644 $ testtransitions() { |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
645 > # this traversal order covers every transition |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
646 > tools="local other prompt local fail other local prompt other fail prompt fail local" |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
647 > lasttool="merge3" |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
648 > for tool in $tools; do |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
649 > echo "=== :$lasttool -> :$tool ===" |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
650 > ref="$TESTTMP/$tool.status" |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
651 > hg resolve --unmark --all |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
652 > hg resolve --tool ":$tool" --all --config ui.interactive=True |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
653 > status > "$TESTTMP/compare.status" 2>&1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
654 > echo '--- diff of status ---' |
27557
28b5c4fcf48d
tests: Solaris diff -U also emits "No differences encountered"
Danek Duvall <danek.duvall@oracle.com>
parents:
27164
diff
changeset
|
655 > if cmp "$TESTTMP/$tool.status" "$TESTTMP/compare.status" || diff -U8 "$TESTTMP/$tool.status" "$TESTTMP/compare.status"; then |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
656 > echo '(status identical)' |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
657 > fi |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
658 > lasttool="$tool" |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
659 > echo |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
660 > done |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
661 > } |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
662 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
663 $ testtransitions |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
664 === :merge3 -> :local === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
665 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
666 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
667 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
668 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
669 === :local -> :other === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
670 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
671 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
672 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
673 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
674 === :other -> :prompt === |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
675 local [working copy] changed file1 which other [merge rev] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
676 use (c)hanged version, (d)elete, or leave (u)nresolved? |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
677 other [merge rev] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
678 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
679 no tool found to merge file3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
680 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
681 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
682 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
683 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
684 === :prompt -> :local === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
685 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
686 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
687 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
688 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
689 === :local -> :fail === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
690 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
691 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
692 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
693 === :fail -> :other === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
694 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
695 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
696 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
697 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
698 === :other -> :local === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
699 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
700 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
701 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
702 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
703 === :local -> :prompt === |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
704 local [working copy] changed file1 which other [merge rev] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
705 use (c)hanged version, (d)elete, or leave (u)nresolved? |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
706 other [merge rev] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
707 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
708 no tool found to merge file3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
709 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
710 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
711 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
712 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
713 === :prompt -> :other === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
714 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
715 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
716 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
717 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
718 === :other -> :fail === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
719 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
720 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
721 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
722 === :fail -> :prompt === |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
723 local [working copy] changed file1 which other [merge rev] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
724 use (c)hanged version, (d)elete, or leave (u)nresolved? |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
725 other [merge rev] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
726 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
727 no tool found to merge file3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
728 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
729 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
730 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
731 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
732 === :prompt -> :fail === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
733 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
734 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
735 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
736 === :fail -> :local === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
737 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
738 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
739 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
740 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
741 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
742 |
26850
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
743 Non-interactive linear update |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
744 |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
745 $ hg co -C 0 |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
746 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
26850
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
747 $ echo changed >> file1 |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
748 $ hg rm file2 |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
749 $ hg update 1 -y |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
750 local [working copy] changed file1 which other [destination] deleted |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
751 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
752 other [destination] changed file2 which local [working copy] deleted |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
753 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
754 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
755 use 'hg resolve' to retry unresolved file merges |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
756 [1] |
26850
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
757 $ status |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
758 --- status --- |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
759 A file1 |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
760 C file2 |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
761 C file3 |
27126
72b4e1bf8f28
test-merge-changedelete.t: add resolve --list output
Siddharth Agarwal <sid0@fb.com>
parents:
27125
diff
changeset
|
762 --- resolve --list --- |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
763 U file1 |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
764 U file2 |
27136
29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
Siddharth Agarwal <sid0@fb.com>
parents:
27126
diff
changeset
|
765 --- debugmergestate --- |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
766 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
767 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
768 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
28634
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
769 labels: |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
770 local: working copy |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
771 other: destination |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
772 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
773 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
774 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
775 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
776 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
777 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
778 file: file2 (record type "C", state "u", hash null) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
779 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
780 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
781 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
782 --- file1 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
783 1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
784 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
785 --- file2 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
786 2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
787 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
788 --- file3 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
789 3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
790 changed1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
791 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
792 Choose local versions of files |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
793 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
794 $ hg co -C 0 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
795 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
796 $ echo changed >> file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
797 $ hg rm file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
798 $ hg update 1 --tool :local |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
799 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
800 $ status 2>&1 | tee $TESTTMP/local.status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
801 --- status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
802 file2: * (glob) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
803 A file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
804 C file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
805 --- resolve --list --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
806 R file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
807 R file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
808 --- debugmergestate --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
809 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
810 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
811 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
28634
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
812 labels: |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
813 local: working copy |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
814 other: destination |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
815 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
816 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
817 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
818 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
819 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
820 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
821 file: file2 (record type "C", state "r", hash null) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
822 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
823 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
824 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
825 --- file1 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
826 1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
827 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
828 *** file2 does not exist |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
829 --- file3 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
830 3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
831 changed1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
832 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
833 Choose other versions of files |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
834 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
835 $ hg co -C 0 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
836 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
837 $ echo changed >> file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
838 $ hg rm file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
839 $ hg update 1 --tool :other |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
840 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
841 $ status 2>&1 | tee $TESTTMP/other.status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
842 --- status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
843 file1: * (glob) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
844 C file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
845 C file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
846 --- resolve --list --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
847 R file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
848 R file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
849 --- debugmergestate --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
850 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
851 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
852 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
28634
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
853 labels: |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
854 local: working copy |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
855 other: destination |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
856 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
857 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
858 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
859 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
860 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
861 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
862 file: file2 (record type "C", state "r", hash null) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
863 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
864 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
865 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
866 *** file1 does not exist |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
867 --- file2 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
868 2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
869 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
870 --- file3 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
871 3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
872 changed1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
873 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
874 Fail |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
875 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
876 $ hg co -C 0 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
877 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
878 $ echo changed >> file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
879 $ hg rm file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
880 $ hg update 1 --tool :fail |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
881 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
882 use 'hg resolve' to retry unresolved file merges |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
883 [1] |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
884 $ status 2>&1 | tee $TESTTMP/fail.status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
885 --- status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
886 A file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
887 C file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
888 C file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
889 --- resolve --list --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
890 U file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
891 U file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
892 --- debugmergestate --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
893 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
894 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
895 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
28634
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
896 labels: |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
897 local: working copy |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
898 other: destination |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
899 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
900 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
901 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
902 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
903 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
904 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
905 file: file2 (record type "C", state "u", hash null) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
906 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
907 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
908 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
26850
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
909 --- file1 --- |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
910 1 |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
911 changed |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
912 --- file2 --- |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
913 2 |
00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
22589
diff
changeset
|
914 changed |
27125
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
915 --- file3 --- |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
916 3 |
969ca40cad1d
test-merge-changedelete.t: add a file with regular merge conflicts
Siddharth Agarwal <sid0@fb.com>
parents:
26947
diff
changeset
|
917 changed1 |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
918 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
919 Force prompts with no input |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
920 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
921 $ hg co -C 0 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
922 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
923 $ echo changed >> file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
924 $ hg rm file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
925 $ hg update 1 --config ui.interactive=True --tool :prompt |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
926 local [working copy] changed file1 which other [destination] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
927 use (c)hanged version, (d)elete, or leave (u)nresolved? |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
928 other [destination] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
929 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
930 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
931 use 'hg resolve' to retry unresolved file merges |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
932 [1] |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
933 $ status 2>&1 | tee $TESTTMP/prompt.status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
934 --- status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
935 A file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
936 C file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
937 C file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
938 --- resolve --list --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
939 U file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
940 U file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
941 --- debugmergestate --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
942 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
943 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
944 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
28634
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
945 labels: |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
946 local: working copy |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
947 other: destination |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
948 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
949 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
950 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
951 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
952 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
953 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
954 file: file2 (record type "C", state "u", hash null) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
955 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
956 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
957 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
958 --- file1 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
959 1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
960 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
961 --- file2 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
962 2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
963 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
964 --- file3 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
965 3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
966 changed1 |
27557
28b5c4fcf48d
tests: Solaris diff -U also emits "No differences encountered"
Danek Duvall <danek.duvall@oracle.com>
parents:
27164
diff
changeset
|
967 $ cmp $TESTTMP/fail.status $TESTTMP/prompt.status || diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
968 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
969 Choose to merge all files |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
970 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
971 $ hg co -C 0 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
972 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
973 $ echo changed >> file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
974 $ hg rm file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
975 $ hg update 1 --tool :merge3 |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
976 local [working copy] changed file1 which other [destination] deleted |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
977 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
978 other [destination] changed file2 which local [working copy] deleted |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
979 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
980 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
981 use 'hg resolve' to retry unresolved file merges |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
982 [1] |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
983 $ status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
984 --- status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
985 A file1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
986 C file2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
987 C file3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
988 --- resolve --list --- |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
989 U file1 |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
990 U file2 |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
991 --- debugmergestate --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
992 * version 2 records |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
993 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
994 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
28634
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
995 labels: |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
996 local: working copy |
3ceac01bc29f
merge: save merge part labels for later reuse
Simon Farnsworth <simonfar@fb.com>
parents:
28029
diff
changeset
|
997 other: destination |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
998 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
999 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1000 local path: file1 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1001 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1002 other path: file1 (node null) |
28011
8abd9f785030
merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents:
27599
diff
changeset
|
1003 file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
1004 file: file2 (record type "C", state "u", hash null) |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1005 local path: file2 (flags "") |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1006 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1007 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1008 --- file1 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1009 1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1010 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1011 --- file2 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1012 2 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1013 changed |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1014 --- file3 --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1015 3 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1016 changed1 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1017 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1018 Test transitions between different merge tools |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1019 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1020 $ testtransitions |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1021 === :merge3 -> :local === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1022 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1023 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1024 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1025 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1026 === :local -> :other === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1027 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1028 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1029 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1030 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1031 === :other -> :prompt === |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
1032 local [working copy] changed file1 which other [destination] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
1033 use (c)hanged version, (d)elete, or leave (u)nresolved? |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
1034 other [destination] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
1035 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1036 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1037 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1038 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1039 === :prompt -> :local === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1040 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1041 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1042 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1043 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1044 === :local -> :fail === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1045 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1046 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1047 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1048 === :fail -> :other === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1049 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1050 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1051 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1052 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1053 === :other -> :local === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1054 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1055 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1056 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1057 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1058 === :local -> :prompt === |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
1059 local [working copy] changed file1 which other [destination] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
1060 use (c)hanged version, (d)elete, or leave (u)nresolved? |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
1061 other [destination] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
1062 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1063 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1064 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1065 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1066 === :prompt -> :other === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1067 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1068 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1069 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1070 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1071 === :other -> :fail === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1072 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1073 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1074 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1075 === :fail -> :prompt === |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
1076 local [working copy] changed file1 which other [destination] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
1077 use (c)hanged version, (d)elete, or leave (u)nresolved? |
29775
978b907d9b36
merge: always use other, not remote, in user prompts
Simon Farnsworth <simonfar@fb.com>
parents:
29774
diff
changeset
|
1078 other [destination] changed file2 which local [working copy] deleted |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
1079 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1080 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1081 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1082 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1083 === :prompt -> :fail === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1084 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1085 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1086 |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1087 === :fail -> :local === |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1088 (no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1089 --- diff of status --- |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1090 (status identical) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27136
diff
changeset
|
1091 |