annotate tests/test-merge-types.t @ 23587:8063901e56cd

memctx: calculate exact status being committed from specified files Before this patch, "memctx._status" is initialized by "(files, [], [], [], [], [], [])" and this causes "memctx.modified" to include not only modified files but also added and removed ones incorrectly. This patch adds "_status" method to calculate exact status being committed according to "files" specified at construction time. Exact "_status" is useful to share/reuse logic of committablectx. This patch is also preparation for issues fixed by subsequent patches. Some details of changes for tests in this patch: - some filename lines are omitted in "test-convert-svn-encoding.t", because they are correctly listed up as "removed" files those lines are written out in "localrepository.commitctx" for "modified" and "added" files by "ui.note". - "| fixbundle" filterring in "test-histedit-fold.t" is omitted to check lines including "added" correctly "fixbundle" discards all lines including "added".
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Wed, 17 Dec 2014 15:09:38 +0900
parents 38e0363dcbe0
children bd625cd4e5e7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 21947
diff changeset
1 #require symlink execbit
15441
e0348815e806 tests: use 'hghave symlink' for tests using symlinks
Mads Kiilerich <mads@kiilerich.com>
parents: 12279
diff changeset
2
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
3 $ tellmeabout() {
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
4 > if [ -h $1 ]; then
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
5 > echo $1 is a symlink:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
6 > $TESTDIR/readlink.py $1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
7 > elif [ -x $1 ]; then
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
8 > echo $1 is an executable file with content:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
9 > cat $1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
10 > else
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
11 > echo $1 is a plain file with content:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
12 > cat $1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
13 > fi
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
14 > }
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
15
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
16 $ hg init test1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
17 $ cd test1
5503
6f26c7677463 Test a merge of a symlink against an executable file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
18
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
19 $ echo a > a
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
20 $ hg ci -Aqmadd
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
21 $ chmod +x a
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
22 $ hg ci -mexecutable
5503
6f26c7677463 Test a merge of a symlink against an executable file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
23
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
24 $ hg up -q 0
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
25 $ rm a
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
26 $ ln -s symlink a
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
27 $ hg ci -msymlink
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
28 created new head
5503
6f26c7677463 Test a merge of a symlink against an executable file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
29
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
30 Symlink is local parent, executable is other:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
31
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
32 $ hg merge --debug
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
33 searching for copies back to rev 1
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
34 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
35 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15442
diff changeset
36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21267
diff changeset
37 preserving a for resolve of a
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
38 a: versions differ -> m
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
39 updating: a 1/1 files (100.00%)
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
40 picked tool 'internal:merge' for a (binary False symlink True)
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
41 merging a
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
42 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
43 warning: internal :merge cannot merge symlinks for a
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
44 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
45 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
46 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
47 [1]
5503
6f26c7677463 Test a merge of a symlink against an executable file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
48
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
49 $ tellmeabout a
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
50 a is a symlink:
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
51 a -> symlink
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
52 $ hg resolve a --tool internal:other
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21693
diff changeset
53 (no more unresolved files)
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
54 $ tellmeabout a
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
55 a is an executable file with content:
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
56 a
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
57 $ hg st
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
58 M a
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
59 ? a.orig
5503
6f26c7677463 Test a merge of a symlink against an executable file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
60
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
61 Symlink is other parent, executable is local:
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
62
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
63 $ hg update -C 1
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
64 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5503
6f26c7677463 Test a merge of a symlink against an executable file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
65
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
66 $ hg merge --debug
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
67 searching for copies back to rev 1
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
68 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
69 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15442
diff changeset
70 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21267
diff changeset
71 preserving a for resolve of a
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
72 a: versions differ -> m
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
73 updating: a 1/1 files (100.00%)
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
74 picked tool 'internal:merge' for a (binary False symlink True)
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
75 merging a
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
76 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
77 warning: internal :merge cannot merge symlinks for a
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
78 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
79 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
80 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
81 [1]
5503
6f26c7677463 Test a merge of a symlink against an executable file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
82
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
83 $ tellmeabout a
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
84 a is an executable file with content:
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
85 a
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5710
diff changeset
86
16255
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
87 Update to link without local change should get us a symlink (issue3316):
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
88
17110
722fd97f6645 tests: fix test markup in test-merge-types.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16355
diff changeset
89 $ hg up -C 0
722fd97f6645 tests: fix test markup in test-merge-types.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16355
diff changeset
90 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
722fd97f6645 tests: fix test markup in test-merge-types.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16355
diff changeset
91 $ hg up
722fd97f6645 tests: fix test markup in test-merge-types.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16355
diff changeset
92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
722fd97f6645 tests: fix test markup in test-merge-types.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16355
diff changeset
93 $ hg st
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
94 ? a.orig
16255
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
95
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
96 Update to link with local change should cause a merge prompt (issue3200):
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
97
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
98 $ hg up -Cq 0
16255
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
99 $ echo data > a
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
100 $ HGMERGE= hg up -y --debug
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
101 searching for copies back to rev 2
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
102 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
103 branchmerge: False, force: False, partial: False
16255
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
104 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21267
diff changeset
105 preserving a for resolve of a
16255
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
106 a: versions differ -> m
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
107 updating: a 1/1 files (100.00%)
16355
cb1475e7e5a2 test-merge-types: allow different output with existing hgmerge (issue3346)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16255
diff changeset
108 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
109 picked tool ':prompt' for a (binary False symlink True)
16255
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
110 no tool found to merge a
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
111 keep (l)ocal or take (o)ther? l
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
112 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
113 $ hg diff --git
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
114 diff --git a/a b/a
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
115 old mode 120000
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
116 new mode 100644
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
117 --- a/a
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
118 +++ b/a
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
119 @@ -1,1 +1,1 @@
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
120 -symlink
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
121 \ No newline at end of file
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
122 +data
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
123
ca5cc2976574 merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents: 15625
diff changeset
124
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
125 Test only 'l' change - happens rarely, except when recovering from situations
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
126 where that was what happened.
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
127
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
128 $ hg init test2
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
129 $ cd test2
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
130 $ printf base > f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
131 $ hg ci -Aqm0
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
132 $ echo file > f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
133 $ echo content >> f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
134 $ hg ci -qm1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
135 $ hg up -qr0
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
136 $ rm f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
137 $ ln -s base f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
138 $ hg ci -qm2
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
139 $ hg merge
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
140 merging f
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
141 warning: internal :merge cannot merge symlinks for f
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
142 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
143 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
144 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
145 [1]
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
146 $ tellmeabout f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
147 f is a symlink:
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
148 f -> base
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
149
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
150 $ hg up -Cqr1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
151 $ hg merge
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
152 merging f
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
153 warning: internal :merge cannot merge symlinks for f
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
154 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
155 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
156 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
157 [1]
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
158 $ tellmeabout f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
159 f is a plain file with content:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
160 file
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
161 content
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
162
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
163 $ cd ..
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
164
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
165 Test removed 'x' flag merged with change to symlink
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
166
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
167 $ hg init test3
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
168 $ cd test3
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
169 $ echo f > f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
170 $ chmod +x f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
171 $ hg ci -Aqm0
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
172 $ chmod -x f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
173 $ hg ci -qm1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
174 $ hg up -qr0
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
175 $ rm f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
176 $ ln -s dangling f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
177 $ hg ci -qm2
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
178 $ hg merge
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
179 merging f
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
180 warning: internal :merge cannot merge symlinks for f
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
181 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
182 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
183 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
184 [1]
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
185 $ tellmeabout f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
186 f is a symlink:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
187 f -> dangling
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
188
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
189 $ hg up -Cqr1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
190 $ hg merge
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
191 merging f
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
192 warning: internal :merge cannot merge symlinks for f
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
193 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
194 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
195 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
196 [1]
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
197 $ tellmeabout f
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
198 f is a plain file with content:
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
199 f
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
200
18505
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
201 Test removed 'x' flag merged with content change - both ways
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
202
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
203 $ hg up -Cqr0
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
204 $ echo change > f
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
205 $ hg ci -qm3
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
206 $ hg merge -r1
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
207 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
208 (branch merge, don't forget to commit)
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
209 $ tellmeabout f
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
210 f is a plain file with content:
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
211 change
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
212
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
213 $ hg up -qCr1
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
214 $ hg merge -r3
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
215 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
216 (branch merge, don't forget to commit)
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
217 $ tellmeabout f
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
218 f is a plain file with content:
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
219 change
9de9727cea53 merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents: 18338
diff changeset
220
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
221 $ cd ..
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
222
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
223 Test merge with no common ancestor:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
224 a: just different
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
225 b: x vs -, different (cannot calculate x, cannot ask merge tool)
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
226 c: x vs -, same (cannot calculate x, merge tool is no good)
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
227 d: x vs l, different
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
228 e: x vs l, same
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
229 f: - vs l, different
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
230 g: - vs l, same
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
231 h: l vs l, different
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
232 (where same means the filelog entry is shared and there thus is an ancestor!)
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
233
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
234 $ hg init test4
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
235 $ cd test4
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
236 $ echo 0 > 0
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
237 $ hg ci -Aqm0
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
238
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
239 $ echo 1 > a
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
240 $ echo 1 > b
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
241 $ chmod +x b
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
242 $ echo x > c
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
243 $ chmod +x c
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
244 $ echo 1 > d
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
245 $ chmod +x d
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
246 $ printf x > e
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
247 $ chmod +x e
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
248 $ echo 1 > f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
249 $ printf x > g
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
250 $ ln -s 1 h
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
251 $ hg ci -qAm1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
252
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
253 $ hg up -qr0
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
254 $ echo 2 > a
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
255 $ echo 2 > b
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
256 $ echo x > c
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
257 $ ln -s 2 d
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
258 $ ln -s x e
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
259 $ ln -s 2 f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
260 $ ln -s x g
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
261 $ ln -s 2 h
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
262 $ hg ci -Aqm2
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
263
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
264 $ hg merge
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
265 merging a
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
266 warning: conflicts during merge.
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
267 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
268 warning: cannot merge flags for b
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
269 merging b
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
270 warning: conflicts during merge.
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
271 merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
20897
0b50788c160c merge: use ancestor filename from planning phase instead of filectx ancestor
Mads Kiilerich <madski@unity3d.com>
parents: 18605
diff changeset
272 warning: cannot merge flags for c
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
273 merging d
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
274 warning: internal :merge cannot merge symlinks for d
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
275 merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
276 merging f
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
277 warning: internal :merge cannot merge symlinks for f
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
278 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
279 merging h
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
280 warning: internal :merge cannot merge symlinks for h
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
281 merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
282 3 files updated, 0 files merged, 0 files removed, 5 files unresolved
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
283 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
284 [1]
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
285 $ hg resolve -l
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
286 U a
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
287 U b
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
288 U d
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
289 U f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
290 U h
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
291 $ tellmeabout a
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
292 a is a plain file with content:
21693
9c35f3a8cac4 merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21519
diff changeset
293 <<<<<<< local: 0139c5610547 - test: 2
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
294 2
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
295 =======
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
296 1
21693
9c35f3a8cac4 merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21519
diff changeset
297 >>>>>>> other: 97e29675e796 - test: 1
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
298 $ tellmeabout b
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
299 b is a plain file with content:
21693
9c35f3a8cac4 merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21519
diff changeset
300 <<<<<<< local: 0139c5610547 - test: 2
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
301 2
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
302 =======
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
303 1
21693
9c35f3a8cac4 merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21519
diff changeset
304 >>>>>>> other: 97e29675e796 - test: 1
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
305 $ tellmeabout c
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
306 c is a plain file with content:
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
307 x
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
308 $ tellmeabout d
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
309 d is a symlink:
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
310 d -> 2
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
311 $ tellmeabout e
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
312 e is a symlink:
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
313 e -> x
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
314 $ tellmeabout f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
315 f is a symlink:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
316 f -> 2
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
317 $ tellmeabout g
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
318 g is a symlink:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
319 g -> x
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
320 $ tellmeabout h
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
321 h is a symlink:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
322 h -> 2
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
323
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
324 $ hg up -Cqr1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
325 $ hg merge
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
326 merging a
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
327 warning: conflicts during merge.
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
328 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
329 warning: cannot merge flags for b
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
330 merging b
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
331 warning: conflicts during merge.
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
332 merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
20897
0b50788c160c merge: use ancestor filename from planning phase instead of filectx ancestor
Mads Kiilerich <madski@unity3d.com>
parents: 18605
diff changeset
333 warning: cannot merge flags for c
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
334 merging d
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
335 warning: internal :merge cannot merge symlinks for d
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
336 merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
337 merging f
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
338 warning: internal :merge cannot merge symlinks for f
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
339 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
340 merging h
22707
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
341 warning: internal :merge cannot merge symlinks for h
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
342 merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
343 3 files updated, 0 files merged, 0 files removed, 5 files unresolved
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
344 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
345 [1]
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
346 $ tellmeabout a
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
347 a is a plain file with content:
21693
9c35f3a8cac4 merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21519
diff changeset
348 <<<<<<< local: 97e29675e796 - test: 1
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
349 1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
350 =======
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
351 2
21693
9c35f3a8cac4 merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21519
diff changeset
352 >>>>>>> other: 0139c5610547 - test: 2
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
353 $ tellmeabout b
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
354 b is an executable file with content:
21693
9c35f3a8cac4 merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21519
diff changeset
355 <<<<<<< local: 97e29675e796 - test: 1
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
356 1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
357 =======
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
358 2
21693
9c35f3a8cac4 merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21519
diff changeset
359 >>>>>>> other: 0139c5610547 - test: 2
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
360 $ tellmeabout c
20897
0b50788c160c merge: use ancestor filename from planning phase instead of filectx ancestor
Mads Kiilerich <madski@unity3d.com>
parents: 18605
diff changeset
361 c is an executable file with content:
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
362 x
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
363 $ tellmeabout d
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
364 d is an executable file with content:
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
365 1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
366 $ tellmeabout e
18338
384df4db6520 merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents: 18337
diff changeset
367 e is an executable file with content:
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
368 x (no-eol)
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
369 $ tellmeabout f
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
370 f is a plain file with content:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
371 1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
372 $ tellmeabout g
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
373 g is a plain file with content:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
374 x (no-eol)
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
375 $ tellmeabout h
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
376 h is a symlink:
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
377 h -> 1
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
378
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
379 $ cd ..