author | Gregory Szorc <gregory.szorc@gmail.com> |
Wed, 07 Feb 2018 20:24:22 -0800 | |
changeset 36069 | 957e773614d0 |
parent 35704 | 41ef02ba329b |
child 39277 | f785073f792c |
permissions | -rw-r--r-- |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
1 |
Set up a base, local, and remote changeset, as well as the working copy state. |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
2 |
Files names are of the form base_remote_local_working-copy. For example, |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
3 |
content1_content2_content1_content2-untracked represents a |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
4 |
file that was modified in the remote changeset, left untouched in the |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
5 |
local changeset, and then modified in the working copy to match the |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
6 |
remote content, then finally forgotten. |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
7 |
|
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
8 |
$ hg init repo |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
9 |
$ cd repo |
6255
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
|
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
11 |
Create base changeset |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
12 |
|
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
30460
diff
changeset
|
13 |
$ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 1 |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
14 |
$ hg addremove -q --similarity 0 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
15 |
$ hg commit -qm 'base' |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
16 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
17 |
Create remote changeset |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
18 |
|
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
30460
diff
changeset
|
19 |
$ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 2 |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
20 |
$ hg addremove -q --similarity 0 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
21 |
$ hg commit -qm 'remote' |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
22 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
23 |
Create local changeset |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
24 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
25 |
$ hg update -q 0 |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
30460
diff
changeset
|
26 |
$ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 3 |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
27 |
$ hg addremove -q --similarity 0 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
28 |
$ hg commit -qm 'local' |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
29 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
30 |
Set up working directory |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
31 |
|
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
30460
diff
changeset
|
32 |
$ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 wc |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
33 |
$ hg addremove -q --similarity 0 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
34 |
$ hg forget *_*_*_*-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
35 |
$ rm *_*_*_missing-* |
12256
2a06cb547be8
tests: unify test-merge-force
Adrian Buehlmann <adrian@cadifra.com>
parents:
6256
diff
changeset
|
36 |
|
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
37 |
$ hg status -A |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
38 |
M content1_content1_content1_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
39 |
M content1_content1_content3_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
40 |
M content1_content1_content3_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
41 |
M content1_content2_content1_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
42 |
M content1_content2_content1_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
43 |
M content1_content2_content2_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
44 |
M content1_content2_content2_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
45 |
M content1_content2_content3_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
46 |
M content1_content2_content3_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
47 |
M content1_content2_content3_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
48 |
M content1_missing_content1_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
49 |
M content1_missing_content3_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
50 |
M content1_missing_content3_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
51 |
M missing_content2_content2_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
52 |
M missing_content2_content3_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
53 |
M missing_content2_content3_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
54 |
M missing_missing_content3_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
55 |
A content1_content1_missing_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
56 |
A content1_content1_missing_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
57 |
A content1_content2_missing_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
58 |
A content1_content2_missing_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
59 |
A content1_content2_missing_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
60 |
A content1_missing_missing_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
61 |
A content1_missing_missing_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
62 |
A missing_content2_missing_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
63 |
A missing_content2_missing_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
64 |
A missing_missing_missing_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
65 |
R content1_content1_content1_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
66 |
R content1_content1_content1_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
67 |
R content1_content1_content1_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
68 |
R content1_content1_content3_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
69 |
R content1_content1_content3_content3-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
70 |
R content1_content1_content3_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
71 |
R content1_content1_content3_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
72 |
R content1_content2_content1_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
73 |
R content1_content2_content1_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
74 |
R content1_content2_content1_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
75 |
R content1_content2_content1_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
76 |
R content1_content2_content2_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
77 |
R content1_content2_content2_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
78 |
R content1_content2_content2_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
79 |
R content1_content2_content2_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
80 |
R content1_content2_content3_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
81 |
R content1_content2_content3_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
82 |
R content1_content2_content3_content3-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
83 |
R content1_content2_content3_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
84 |
R content1_content2_content3_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
85 |
R content1_missing_content1_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
86 |
R content1_missing_content1_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
87 |
R content1_missing_content1_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
88 |
R content1_missing_content3_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
89 |
R content1_missing_content3_content3-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
90 |
R content1_missing_content3_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
91 |
R content1_missing_content3_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
92 |
R missing_content2_content2_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
93 |
R missing_content2_content2_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
94 |
R missing_content2_content2_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
95 |
R missing_content2_content3_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
96 |
R missing_content2_content3_content3-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
97 |
R missing_content2_content3_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
98 |
R missing_content2_content3_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
99 |
R missing_missing_content3_content3-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
100 |
R missing_missing_content3_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
101 |
R missing_missing_content3_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
102 |
! content1_content1_content1_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
103 |
! content1_content1_content3_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
104 |
! content1_content1_missing_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
105 |
! content1_content2_content1_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
106 |
! content1_content2_content2_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
107 |
! content1_content2_content3_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
108 |
! content1_content2_missing_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
109 |
! content1_missing_content1_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
110 |
! content1_missing_content3_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
111 |
! content1_missing_missing_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
112 |
! missing_content2_content2_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
113 |
! missing_content2_content3_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
114 |
! missing_content2_missing_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
115 |
! missing_missing_content3_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
116 |
! missing_missing_missing_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
117 |
? content1_content1_missing_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
118 |
? content1_content1_missing_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
119 |
? content1_content2_missing_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
120 |
? content1_content2_missing_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
121 |
? content1_content2_missing_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
122 |
? content1_missing_missing_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
123 |
? content1_missing_missing_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
124 |
? missing_content2_missing_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
125 |
? missing_content2_missing_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
126 |
? missing_missing_missing_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
127 |
C content1_content1_content1_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
128 |
C content1_content1_content3_content3-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
129 |
C content1_content2_content1_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
130 |
C content1_content2_content2_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
131 |
C content1_content2_content3_content3-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
132 |
C content1_missing_content1_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
133 |
C content1_missing_content3_content3-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
134 |
C missing_content2_content2_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
135 |
C missing_content2_content3_content3-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
136 |
C missing_missing_content3_content3-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
137 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
138 |
Merge with remote |
6255
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
139 |
|
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
140 |
# Notes: |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
141 |
# - local and remote changed content1_content2_*_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
142 |
# in the same way, so it could potentially be left alone |
6255
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
143 |
|
28021
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
144 |
$ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
145 |
local [working copy] changed content1_missing_content1_content4-tracked 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
|
146 |
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
|
147 |
local [working copy] changed content1_missing_content3_content3-tracked 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
|
148 |
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
|
149 |
local [working copy] changed content1_missing_content3_content4-tracked 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
|
150 |
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
|
151 |
local [working copy] changed content1_missing_missing_content4-tracked 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
|
152 |
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
|
153 |
other [merge rev] changed content1_content2_content1_content1-untracked 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
|
154 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
155 |
other [merge rev] changed content1_content2_content1_content2-untracked 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
|
156 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
157 |
other [merge rev] changed content1_content2_content1_content4-untracked 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
|
158 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
159 |
other [merge rev] changed content1_content2_content1_missing-tracked 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
|
160 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
161 |
other [merge rev] changed content1_content2_content1_missing-untracked 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
|
162 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
163 |
other [merge rev] changed content1_content2_content2_content1-untracked 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
|
164 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
165 |
other [merge rev] changed content1_content2_content2_content2-untracked 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
|
166 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
167 |
other [merge rev] changed content1_content2_content2_content4-untracked 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
|
168 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
169 |
other [merge rev] changed content1_content2_content2_missing-tracked 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
|
170 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
171 |
other [merge rev] changed content1_content2_content2_missing-untracked 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
|
172 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
173 |
other [merge rev] changed content1_content2_content3_content1-untracked 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
|
174 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
175 |
other [merge rev] changed content1_content2_content3_content2-untracked 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
|
176 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
177 |
other [merge rev] changed content1_content2_content3_content3-untracked 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
|
178 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
179 |
other [merge rev] changed content1_content2_content3_content4-untracked 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
|
180 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
181 |
other [merge rev] changed content1_content2_content3_missing-tracked 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
|
182 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
183 |
other [merge rev] changed content1_content2_content3_missing-untracked 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
|
184 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
185 |
other [merge rev] changed content1_content2_missing_content1-untracked 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
|
186 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
187 |
other [merge rev] changed content1_content2_missing_content2-untracked 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
|
188 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
189 |
other [merge rev] changed content1_content2_missing_content4-untracked 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
|
190 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
191 |
other [merge rev] changed content1_content2_missing_missing-tracked 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
|
192 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
193 |
other [merge rev] changed content1_content2_missing_missing-untracked 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
|
194 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
195 |
merging content1_content2_content1_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
196 |
merging content1_content2_content2_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
197 |
merging content1_content2_content2_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
198 |
merging content1_content2_content3_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
199 |
merging content1_content2_content3_content3-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
200 |
merging content1_content2_content3_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
201 |
merging content1_content2_missing_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
202 |
merging content1_content2_missing_content4-tracked |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
203 |
merging missing_content2_content2_content4-tracked |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
204 |
merging missing_content2_content3_content3-tracked |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
205 |
merging missing_content2_content3_content4-tracked |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
206 |
merging missing_content2_missing_content4-tracked |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
207 |
merging missing_content2_missing_content4-untracked |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
208 |
warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
209 |
warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
210 |
warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
211 |
warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
23543
diff
changeset
|
212 |
warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
23543
diff
changeset
|
213 |
warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
23543
diff
changeset
|
214 |
warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
23543
diff
changeset
|
215 |
warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
23543
diff
changeset
|
216 |
warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
23543
diff
changeset
|
217 |
warning: conflicts while merging missing_content2_missing_content4-untracked! (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
|
218 |
18 files updated, 3 files merged, 8 files removed, 35 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32940
diff
changeset
|
219 |
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
12256
2a06cb547be8
tests: unify test-merge-force
Adrian Buehlmann <adrian@cadifra.com>
parents:
6256
diff
changeset
|
220 |
|
23543
4dd8a6a1240d
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23449
diff
changeset
|
221 |
Check which files need to be resolved (should correspond to the output above). |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
222 |
This should be the files for which the base (1st filename segment), the remote |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
223 |
(2nd segment) and the working copy (4th segment) are all different. |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
224 |
|
23543
4dd8a6a1240d
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23449
diff
changeset
|
225 |
Interestingly, one untracked file got merged and added, which corresponds to the |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
226 |
odd 'if force and branchmerge and different' case in manifestmerge(). |
12256
2a06cb547be8
tests: unify test-merge-force
Adrian Buehlmann <adrian@cadifra.com>
parents:
6256
diff
changeset
|
227 |
|
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
228 |
$ hg resolve -l |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
229 |
U content1_content2_content1_content1-untracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
230 |
U content1_content2_content1_content2-untracked |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
231 |
U content1_content2_content1_content4-tracked |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
232 |
U content1_content2_content1_content4-untracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
233 |
U content1_content2_content1_missing-tracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
234 |
U content1_content2_content1_missing-untracked |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
235 |
R content1_content2_content2_content1-tracked |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
236 |
U content1_content2_content2_content1-untracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
237 |
U content1_content2_content2_content2-untracked |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
238 |
U content1_content2_content2_content4-tracked |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
239 |
U content1_content2_content2_content4-untracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
240 |
U content1_content2_content2_missing-tracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
241 |
U content1_content2_content2_missing-untracked |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
242 |
R content1_content2_content3_content1-tracked |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
243 |
U content1_content2_content3_content1-untracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
244 |
U content1_content2_content3_content2-untracked |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
245 |
U content1_content2_content3_content3-tracked |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
246 |
U content1_content2_content3_content3-untracked |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
247 |
U content1_content2_content3_content4-tracked |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
248 |
U content1_content2_content3_content4-untracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
249 |
U content1_content2_content3_missing-tracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
250 |
U content1_content2_content3_missing-untracked |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
251 |
R content1_content2_missing_content1-tracked |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
252 |
U content1_content2_missing_content1-untracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
253 |
U content1_content2_missing_content2-untracked |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
254 |
U content1_content2_missing_content4-tracked |
27599
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
255 |
U content1_content2_missing_content4-untracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
256 |
U content1_content2_missing_missing-tracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
257 |
U content1_content2_missing_missing-untracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
258 |
U content1_missing_content1_content4-tracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
259 |
U content1_missing_content3_content3-tracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
260 |
U content1_missing_content3_content4-tracked |
ad5966de3c9a
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27557
diff
changeset
|
261 |
U content1_missing_missing_content4-tracked |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
262 |
U missing_content2_content2_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
263 |
U missing_content2_content3_content3-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
264 |
U missing_content2_content3_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
265 |
U missing_content2_missing_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
266 |
U missing_content2_missing_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
267 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
268 |
Check status and file content |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
269 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
270 |
Some files get added (e.g. content1_content2_content1_content1-untracked) |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
271 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
272 |
It is not intuitive that content1_content2_content1_content4-tracked gets |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
273 |
merged while content1_content2_content1_content4-untracked gets overwritten. |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
274 |
Any *_content2_*-untracked triggers the modified/deleted prompt and then gets |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
275 |
overwritten. |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
276 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
277 |
A lot of untracked files become tracked, for example |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
278 |
content1_content2_content2_content2-untracked. |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
279 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
280 |
*_missing_missing_missing-tracked is reported as removed ('R'), which |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
281 |
doesn't make sense since the file did not exist in the parent, but on the |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
282 |
other hand, merged-in additions are reported as modifications, which is |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
283 |
almost as strange. |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
284 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
285 |
missing_missing_content3_missing-tracked becomes removed ('R'), even though |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
286 |
the remote side did not touch the file |
6255
ae83d927c629
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
287 |
|
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
288 |
$ checkstatus() { |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
30460
diff
changeset
|
289 |
> for f in `$PYTHON $TESTDIR/generate-working-copy-states.py filelist 3` |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
290 |
> do |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
291 |
> echo |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
292 |
> hg status -A $f |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
293 |
> if test -f $f |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
294 |
> then |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
295 |
> cat $f |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
296 |
> else |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
297 |
> echo '<missing>' |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
298 |
> fi |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
299 |
> done |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
300 |
> } |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
301 |
$ checkstatus 2>&1 | tee $TESTTMP/status1 |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
302 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
303 |
C content1_content1_content1_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
304 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
305 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
306 |
R content1_content1_content1_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
307 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
308 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
309 |
M content1_content1_content1_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
310 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
311 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
312 |
R content1_content1_content1_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
313 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
314 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
315 |
! content1_content1_content1_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
316 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
317 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
318 |
R content1_content1_content1_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
319 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
320 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
321 |
M content1_content1_content3_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
322 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
323 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
324 |
R content1_content1_content3_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
325 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
326 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
327 |
C content1_content1_content3_content3-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
328 |
content3 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
329 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
330 |
R content1_content1_content3_content3-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
331 |
content3 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
332 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
333 |
M content1_content1_content3_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
334 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
335 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
336 |
R content1_content1_content3_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
337 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
338 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
339 |
! content1_content1_content3_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
340 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
341 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
342 |
R content1_content1_content3_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
343 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
344 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
345 |
A content1_content1_missing_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
346 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
347 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
348 |
? content1_content1_missing_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
349 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
350 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
351 |
A content1_content1_missing_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
352 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
353 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
354 |
? content1_content1_missing_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
355 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
356 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
357 |
! content1_content1_missing_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
358 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
359 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
360 |
content1_content1_missing_missing-untracked: * (glob) |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
361 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
362 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
363 |
M content1_content2_content1_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
364 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
365 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
366 |
M content1_content2_content1_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
367 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
368 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
369 |
M content1_content2_content1_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
370 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
371 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
372 |
M content1_content2_content1_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
373 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
374 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
375 |
M content1_content2_content1_content4-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
376 |
<<<<<<< working copy: 0447570f1af6 - test: local |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
377 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
378 |
||||||| base |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
379 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
380 |
======= |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
381 |
content2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
382 |
>>>>>>> merge rev: 85100b8c675b - test: remote |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
383 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
384 |
M content1_content2_content1_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
385 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
386 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
387 |
M content1_content2_content1_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
388 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
389 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
390 |
M content1_content2_content1_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
391 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
392 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
393 |
M content1_content2_content2_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
394 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
395 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
396 |
M content1_content2_content2_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
397 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
398 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
399 |
C content1_content2_content2_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
400 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
401 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
402 |
M content1_content2_content2_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
403 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
404 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
405 |
M content1_content2_content2_content4-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
406 |
<<<<<<< working copy: 0447570f1af6 - test: local |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
407 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
408 |
||||||| base |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
409 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
410 |
======= |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
411 |
content2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
412 |
>>>>>>> merge rev: 85100b8c675b - test: remote |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
413 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
414 |
M content1_content2_content2_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
415 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
416 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
417 |
M content1_content2_content2_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
418 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
419 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
420 |
M content1_content2_content2_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
421 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
422 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
423 |
M content1_content2_content3_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
424 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
425 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
426 |
M content1_content2_content3_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
427 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
428 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
429 |
M content1_content2_content3_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
430 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
431 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
432 |
M content1_content2_content3_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
433 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
434 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
435 |
M content1_content2_content3_content3-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
436 |
<<<<<<< working copy: 0447570f1af6 - test: local |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
437 |
content3 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
438 |
||||||| base |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
439 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
440 |
======= |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
441 |
content2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
442 |
>>>>>>> merge rev: 85100b8c675b - test: remote |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
443 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
444 |
M content1_content2_content3_content3-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
445 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
446 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
447 |
M content1_content2_content3_content4-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
448 |
<<<<<<< working copy: 0447570f1af6 - test: local |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
449 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
450 |
||||||| base |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
451 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
452 |
======= |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
453 |
content2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
454 |
>>>>>>> merge rev: 85100b8c675b - test: remote |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
455 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
456 |
M content1_content2_content3_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
457 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
458 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
459 |
M content1_content2_content3_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
460 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
461 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
462 |
M content1_content2_content3_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
463 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
464 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
465 |
M content1_content2_missing_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
466 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
467 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
468 |
M content1_content2_missing_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
469 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
470 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
471 |
M content1_content2_missing_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
472 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
473 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
474 |
M content1_content2_missing_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
475 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
476 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
477 |
M content1_content2_missing_content4-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
478 |
<<<<<<< working copy: 0447570f1af6 - test: local |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
479 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
480 |
||||||| base |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
481 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
482 |
======= |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
483 |
content2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
484 |
>>>>>>> merge rev: 85100b8c675b - test: remote |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
485 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
486 |
M content1_content2_missing_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
487 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
488 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
489 |
M content1_content2_missing_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
490 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
491 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
492 |
M content1_content2_missing_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
493 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
494 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
495 |
R content1_missing_content1_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
496 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
497 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
498 |
R content1_missing_content1_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
499 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
500 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
501 |
M content1_missing_content1_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
502 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
503 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
504 |
R content1_missing_content1_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
505 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
506 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
507 |
R content1_missing_content1_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
508 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
509 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
510 |
R content1_missing_content1_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
511 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
512 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
513 |
R content1_missing_content3_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
514 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
515 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
516 |
R content1_missing_content3_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
517 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
518 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
519 |
C content1_missing_content3_content3-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
520 |
content3 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
521 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
522 |
R content1_missing_content3_content3-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
523 |
content3 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
524 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
525 |
M content1_missing_content3_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
526 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
527 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
528 |
R content1_missing_content3_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
529 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
530 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
531 |
R content1_missing_content3_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
532 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
533 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
534 |
R content1_missing_content3_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
535 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
536 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
537 |
R content1_missing_missing_content1-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
538 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
539 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
540 |
? content1_missing_missing_content1-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
541 |
content1 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
542 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
543 |
A content1_missing_missing_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
544 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
545 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
546 |
? content1_missing_missing_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
547 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
548 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
549 |
R content1_missing_missing_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
550 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
551 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
552 |
content1_missing_missing_missing-untracked: * (glob) |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
553 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
554 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
555 |
C missing_content2_content2_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
556 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
557 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
558 |
M missing_content2_content2_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
559 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
560 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
561 |
M missing_content2_content2_content4-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
562 |
<<<<<<< working copy: 0447570f1af6 - test: local |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
563 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
564 |
||||||| base |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
565 |
======= |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
566 |
content2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
567 |
>>>>>>> merge rev: 85100b8c675b - test: remote |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
568 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
569 |
M missing_content2_content2_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
570 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
571 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
572 |
M missing_content2_content2_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
573 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
574 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
575 |
M missing_content2_content2_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
576 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
577 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
578 |
M missing_content2_content3_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
579 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
580 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
581 |
M missing_content2_content3_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
582 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
583 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
584 |
M missing_content2_content3_content3-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
585 |
<<<<<<< working copy: 0447570f1af6 - test: local |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
586 |
content3 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
587 |
||||||| base |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
588 |
======= |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
589 |
content2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
590 |
>>>>>>> merge rev: 85100b8c675b - test: remote |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
591 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
592 |
M missing_content2_content3_content3-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
593 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
594 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
595 |
M missing_content2_content3_content4-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
596 |
<<<<<<< working copy: 0447570f1af6 - test: local |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
597 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
598 |
||||||| base |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
599 |
======= |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
600 |
content2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
601 |
>>>>>>> merge rev: 85100b8c675b - test: remote |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
602 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
603 |
M missing_content2_content3_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
604 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
605 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
606 |
M missing_content2_content3_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
607 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
608 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
609 |
M missing_content2_content3_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
610 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
611 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
612 |
M missing_content2_missing_content2-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
613 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
614 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
615 |
M missing_content2_missing_content2-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
616 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
617 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
618 |
M missing_content2_missing_content4-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
619 |
<<<<<<< working copy: 0447570f1af6 - test: local |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
620 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
621 |
||||||| base |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
622 |
======= |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
623 |
content2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
624 |
>>>>>>> merge rev: 85100b8c675b - test: remote |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
625 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
626 |
M missing_content2_missing_content4-untracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
627 |
<<<<<<< working copy: 0447570f1af6 - test: local |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
628 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
629 |
||||||| base |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
630 |
======= |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
631 |
content2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
632 |
>>>>>>> merge rev: 85100b8c675b - test: remote |
23449
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
633 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
634 |
M missing_content2_missing_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
635 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
636 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
637 |
M missing_content2_missing_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
638 |
content2 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
639 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
640 |
C missing_missing_content3_content3-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
641 |
content3 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
642 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
643 |
R missing_missing_content3_content3-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
644 |
content3 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
645 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
646 |
M missing_missing_content3_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
647 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
648 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
649 |
R missing_missing_content3_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
650 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
651 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
652 |
R missing_missing_content3_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
653 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
654 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
655 |
R missing_missing_content3_missing-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
656 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
657 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
658 |
A missing_missing_missing_content4-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
659 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
660 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
661 |
? missing_missing_missing_content4-untracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
662 |
content4 |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
663 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
664 |
R missing_missing_missing_missing-tracked |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
665 |
<missing> |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
666 |
|
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
667 |
missing_missing_missing_missing-untracked: * (glob) |
eeecf29cc397
merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents:
19802
diff
changeset
|
668 |
<missing> |
27133
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
669 |
|
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
30460
diff
changeset
|
670 |
$ for f in `$PYTHON $TESTDIR/generate-working-copy-states.py filelist 3` |
27133
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
671 |
> do |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
672 |
> if test -f ${f}.orig |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
673 |
> then |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
674 |
> echo ${f}.orig: |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
675 |
> cat ${f}.orig |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
676 |
> fi |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
677 |
> done |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
678 |
content1_content2_content1_content4-tracked.orig: |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
679 |
content4 |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
680 |
content1_content2_content2_content4-tracked.orig: |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
681 |
content4 |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
682 |
content1_content2_content3_content3-tracked.orig: |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
683 |
content3 |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
684 |
content1_content2_content3_content4-tracked.orig: |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
685 |
content4 |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
686 |
content1_content2_missing_content4-tracked.orig: |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
687 |
content4 |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
688 |
missing_content2_content2_content4-tracked.orig: |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
689 |
content4 |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
690 |
missing_content2_content3_content3-tracked.orig: |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
691 |
content3 |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
692 |
missing_content2_content3_content4-tracked.orig: |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
693 |
content4 |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
694 |
missing_content2_missing_content4-tracked.orig: |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
695 |
content4 |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
696 |
missing_content2_missing_content4-untracked.orig: |
8dff49c34a67
test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
697 |
content4 |
27137
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
698 |
|
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
699 |
Re-resolve and check status |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
700 |
|
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
701 |
$ hg resolve --unmark --all |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
702 |
$ hg resolve --all --tool :local |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
703 |
(no more unresolved files) |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
704 |
$ hg resolve --unmark --all |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
705 |
$ hg resolve --all --tool internal:merge3 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
706 |
other [merge rev] changed content1_content2_content1_content1-untracked 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
|
707 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
708 |
other [merge rev] changed content1_content2_content1_content2-untracked 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
|
709 |
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:
27133
diff
changeset
|
710 |
merging content1_content2_content1_content4-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
711 |
other [merge rev] changed content1_content2_content1_content4-untracked 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
|
712 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
713 |
other [merge rev] changed content1_content2_content1_missing-tracked 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
|
714 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
715 |
other [merge rev] changed content1_content2_content1_missing-untracked 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
|
716 |
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:
27133
diff
changeset
|
717 |
merging content1_content2_content2_content1-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
718 |
other [merge rev] changed content1_content2_content2_content1-untracked 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
|
719 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
720 |
other [merge rev] changed content1_content2_content2_content2-untracked 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
|
721 |
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:
27133
diff
changeset
|
722 |
merging content1_content2_content2_content4-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
723 |
other [merge rev] changed content1_content2_content2_content4-untracked 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
|
724 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
725 |
other [merge rev] changed content1_content2_content2_missing-tracked 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
|
726 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
727 |
other [merge rev] changed content1_content2_content2_missing-untracked 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
|
728 |
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:
27133
diff
changeset
|
729 |
merging content1_content2_content3_content1-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
730 |
other [merge rev] changed content1_content2_content3_content1-untracked 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
|
731 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
732 |
other [merge rev] changed content1_content2_content3_content2-untracked 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
|
733 |
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:
27133
diff
changeset
|
734 |
merging content1_content2_content3_content3-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
735 |
other [merge rev] changed content1_content2_content3_content3-untracked 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
|
736 |
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:
27133
diff
changeset
|
737 |
merging content1_content2_content3_content4-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
738 |
other [merge rev] changed content1_content2_content3_content4-untracked 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
|
739 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
740 |
other [merge rev] changed content1_content2_content3_missing-tracked 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
|
741 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
742 |
other [merge rev] changed content1_content2_content3_missing-untracked 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
|
743 |
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:
27133
diff
changeset
|
744 |
merging content1_content2_missing_content1-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
745 |
other [merge rev] changed content1_content2_missing_content1-untracked 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
|
746 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
747 |
other [merge rev] changed content1_content2_missing_content2-untracked 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
|
748 |
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:
27133
diff
changeset
|
749 |
merging content1_content2_missing_content4-tracked |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
750 |
other [merge rev] changed content1_content2_missing_content4-untracked 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
|
751 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
752 |
other [merge rev] changed content1_content2_missing_missing-tracked 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 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
754 |
other [merge rev] changed content1_content2_missing_missing-untracked 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
|
755 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
756 |
local [working copy] changed content1_missing_content1_content4-tracked 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
|
757 |
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
|
758 |
local [working copy] changed content1_missing_content3_content3-tracked 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
|
759 |
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
|
760 |
local [working copy] changed content1_missing_content3_content4-tracked 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
|
761 |
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
|
762 |
local [working copy] changed content1_missing_missing_content4-tracked 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
|
763 |
use (c)hanged version, (d)elete, 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:
27133
diff
changeset
|
764 |
merging missing_content2_content2_content4-tracked |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
765 |
merging missing_content2_content3_content3-tracked |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
766 |
merging missing_content2_content3_content4-tracked |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
767 |
merging missing_content2_missing_content4-tracked |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
768 |
merging missing_content2_missing_content4-untracked |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
769 |
warning: conflicts while merging content1_content2_content1_content4-tracked! (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:
27133
diff
changeset
|
770 |
warning: conflicts while merging content1_content2_content2_content4-tracked! (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:
27133
diff
changeset
|
771 |
warning: conflicts while merging content1_content2_content3_content3-tracked! (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:
27133
diff
changeset
|
772 |
warning: conflicts while merging content1_content2_content3_content4-tracked! (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:
27133
diff
changeset
|
773 |
warning: conflicts while merging content1_content2_missing_content4-tracked! (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:
27133
diff
changeset
|
774 |
warning: conflicts while merging missing_content2_content2_content4-tracked! (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:
27133
diff
changeset
|
775 |
warning: conflicts while merging missing_content2_content3_content3-tracked! (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:
27133
diff
changeset
|
776 |
warning: conflicts while merging missing_content2_content3_content4-tracked! (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:
27133
diff
changeset
|
777 |
warning: conflicts while merging missing_content2_missing_content4-tracked! (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:
27133
diff
changeset
|
778 |
warning: conflicts while merging missing_content2_missing_content4-untracked! (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:
27133
diff
changeset
|
779 |
[1] |
25e4b2f000c5
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents:
27133
diff
changeset
|
780 |
$ checkstatus > $TESTTMP/status2 2>&1 |
27557
28b5c4fcf48d
tests: Solaris diff -U also emits "No differences encountered"
Danek Duvall <danek.duvall@oracle.com>
parents:
27163
diff
changeset
|
781 |
$ cmp $TESTTMP/status1 $TESTTMP/status2 || diff -U8 $TESTTMP/status1 $TESTTMP/status2 |
28021
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
782 |
|
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
783 |
Set up working directory again |
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
784 |
|
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
785 |
$ hg -q update --clean 2 |
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
786 |
$ hg --config extensions.purge= purge |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
30460
diff
changeset
|
787 |
$ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 wc |
28021
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
788 |
$ hg addremove -q --similarity 0 |
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
789 |
$ hg forget *_*_*_*-untracked |
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
790 |
$ rm *_*_*_missing-* |
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
791 |
|
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
792 |
Merge with checkunknown = warn, see that behavior is the same as before |
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
793 |
$ hg merge -f --tool internal:merge3 'desc("remote")' --config merge.checkunknown=warn > $TESTTMP/merge-output-2 2>&1 |
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
794 |
[1] |
d0d805df6a44
test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents:
27599
diff
changeset
|
795 |
$ cmp $TESTTMP/merge-output-1 $TESTTMP/merge-output-2 || diff -U8 $TESTTMP/merge-output-1 $TESTTMP/merge-output-2 |