Mercurial > hg
annotate tests/test-merge-types.t @ 20954:dba91f8060eb
bundle2: add an exchange.getbundle function
This function can return a `HG10` or `HG20` bundle. It uses the `bundlecaps`
parameters to decides which one to return.
This is a distinct function from `changegroup.getbundle` for two reasons. First
the APIs of `bundle10` and `bundle20` are not compatible yet. The two functions
may be reunited in the future. Second `exchange.getbundle` will grow parameters
for all kinds of data (phases, obsmarkers, ...) so it's better to keep the
changegroup generation in its own function for now.
This function will be used it in the next changesets.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 04 Apr 2014 01:51:54 -0700 |
parents | 0b50788c160c |
children | 19d6fec60b81 |
rev | line source |
---|---|
15442
db0340f4b507
tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mads Kiilerich <mads@kiilerich.com>
parents:
15441
diff
changeset
|
1 $ "$TESTDIR/hghave" symlink execbit || exit 80 |
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 | 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 | 21 $ chmod +x a |
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 | 25 $ rm a |
26 $ ln -s symlink a | |
27 $ hg ci -msymlink | |
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 | 32 $ hg merge --debug |
33 searching for copies back to rev 1 | |
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 |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
37 a: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18505
diff
changeset
|
38 preserving a for resolve of a |
12279 | 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 |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
43 warning: internal:merge cannot merge symlinks for a |
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 |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
53 $ tellmeabout a |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
54 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
|
55 a |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
56 $ hg st |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
57 M a |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
58 ? a.orig |
5503
6f26c7677463
Test a merge of a symlink against an executable file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
59 |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
60 Symlink is other parent, executable is local: |
12279 | 61 |
62 $ hg update -C 1 | |
63 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
|
64 |
12279 | 65 $ hg merge --debug |
66 searching for copies back to rev 1 | |
67 resolving manifests | |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
68 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15442
diff
changeset
|
69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
70 a: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18505
diff
changeset
|
71 preserving a for resolve of a |
12279 | 72 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
|
73 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
|
74 merging a |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
75 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
76 warning: internal:merge cannot merge symlinks for a |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
77 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
|
78 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
|
79 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
|
80 [1] |
5503
6f26c7677463
Test a merge of a symlink against an executable file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
81 |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
82 $ tellmeabout a |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
83 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
|
84 a |
12279 | 85 |
16255
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
86 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
|
87 |
17110
722fd97f6645
tests: fix test markup in test-merge-types.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16355
diff
changeset
|
88 $ hg up -C 0 |
722fd97f6645
tests: fix test markup in test-merge-types.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16355
diff
changeset
|
89 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
|
90 $ hg up |
722fd97f6645
tests: fix test markup in test-merge-types.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16355
diff
changeset
|
91 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
|
92 $ hg st |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
93 ? a.orig |
16255
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
94 |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
95 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
|
96 |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
97 $ hg up -Cq 0 |
16255
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
98 $ echo data > a |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
99 $ HGMERGE= hg up -y --debug |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
100 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
|
101 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
102 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
|
103 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
104 a: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18505
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 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
|
107 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
16255
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
108 picked tool 'internal:prompt' for a (binary False symlink True) |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
109 no tool found to merge a |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
110 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
|
111 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
|
112 $ hg diff --git |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
113 diff --git a/a b/a |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
114 old mode 120000 |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
115 new mode 100644 |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
116 --- a/a |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
117 +++ b/a |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
118 @@ -1,1 +1,1 @@ |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
119 -symlink |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
120 \ No newline at end of file |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
121 +data |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
122 |
ca5cc2976574
merge: handle linear update to symlink correctly (issue3316)
Matt Mackall <mpm@selenic.com>
parents:
15625
diff
changeset
|
123 |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
124 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
|
125 where that was what happened. |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
126 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
127 $ hg init test2 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
128 $ cd test2 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
129 $ printf base > f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
130 $ hg ci -Aqm0 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
131 $ echo file > f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
132 $ echo content >> f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
133 $ hg ci -qm1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
134 $ hg up -qr0 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
135 $ rm f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
136 $ ln -s base f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
137 $ hg ci -qm2 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
138 $ hg merge |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
139 merging f |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
140 warning: internal:merge cannot merge symlinks for f |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
141 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
|
142 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
|
143 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
|
144 [1] |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
145 $ tellmeabout f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
146 f is a symlink: |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
147 f -> base |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
148 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
149 $ hg up -Cqr1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
150 $ hg merge |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
151 merging f |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
152 warning: internal:merge cannot merge symlinks for f |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
153 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
|
154 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
|
155 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
|
156 [1] |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
157 $ tellmeabout f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
158 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
|
159 file |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
160 content |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
161 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
162 $ cd .. |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
163 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
164 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
|
165 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
166 $ hg init test3 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
167 $ cd test3 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
168 $ echo f > f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
169 $ chmod +x f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
170 $ hg ci -Aqm0 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
171 $ chmod -x f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
172 $ hg ci -qm1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
173 $ hg up -qr0 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
174 $ rm f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
175 $ ln -s dangling f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
176 $ hg ci -qm2 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
177 $ hg merge |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
178 merging f |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
179 warning: internal:merge cannot merge symlinks for f |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
180 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
|
181 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
|
182 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
|
183 [1] |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
184 $ tellmeabout f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
185 f is a symlink: |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
186 f -> dangling |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
187 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
188 $ hg up -Cqr1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
189 $ hg merge |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
190 merging f |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
191 warning: internal:merge cannot merge symlinks for f |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
192 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
|
193 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
|
194 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
|
195 [1] |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
196 $ tellmeabout f |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
197 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
|
198 f |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
199 |
18505
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
200 Test removed 'x' flag merged with content change - both ways |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
201 |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
202 $ hg up -Cqr0 |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
203 $ echo change > f |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
204 $ hg ci -qm3 |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
205 $ hg merge -r1 |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
206 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
|
207 (branch merge, don't forget to commit) |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
208 $ tellmeabout f |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
209 f is a plain file with content: |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
210 change |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
211 |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
212 $ hg up -qCr1 |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
213 $ hg merge -r3 |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
214 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
|
215 (branch merge, don't forget to commit) |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
216 $ tellmeabout f |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
217 f is a plain file with content: |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
218 change |
9de9727cea53
merge: fix UnboundLocalError (issue3791)
Mads Kiilerich <madski@unity3d.com>
parents:
18338
diff
changeset
|
219 |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
220 $ cd .. |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
221 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
222 Test merge with no common ancestor: |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
223 a: just different |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
224 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
|
225 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
|
226 d: x vs l, different |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
227 e: x vs l, same |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
228 f: - vs l, different |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
229 g: - vs l, same |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
230 h: l vs l, different |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
231 (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
|
232 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
233 $ hg init test4 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
234 $ cd test4 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
235 $ echo 0 > 0 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
236 $ hg ci -Aqm0 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
237 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
238 $ echo 1 > a |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
239 $ echo 1 > b |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
240 $ chmod +x b |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
241 $ echo x > c |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
242 $ chmod +x c |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
243 $ echo 1 > d |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
244 $ chmod +x d |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
245 $ printf x > e |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
246 $ chmod +x e |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
247 $ echo 1 > f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
248 $ printf x > g |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
249 $ ln -s 1 h |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
250 $ hg ci -qAm1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
251 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
252 $ hg up -qr0 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
253 $ echo 2 > a |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
254 $ echo 2 > b |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
255 $ echo x > c |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
256 $ ln -s 2 d |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
257 $ ln -s x e |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
258 $ ln -s 2 f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
259 $ ln -s x g |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
260 $ ln -s 2 h |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
261 $ hg ci -Aqm2 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
262 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
263 $ hg merge |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
264 merging a |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
265 warning: conflicts during merge. |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
266 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
|
267 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
|
268 merging b |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
269 warning: conflicts during merge. |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
270 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
|
271 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
|
272 merging d |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
273 warning: internal:merge cannot merge symlinks for d |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
274 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
|
275 merging f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
276 warning: internal:merge cannot merge symlinks for f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
277 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
|
278 merging h |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
279 warning: internal:merge cannot merge symlinks for h |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
280 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
|
281 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
|
282 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
|
283 [1] |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
284 $ hg resolve -l |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
285 U a |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
286 U b |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
287 U d |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
288 U f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
289 U h |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
290 $ tellmeabout a |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
291 a is a plain file with content: |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
292 <<<<<<< local |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
293 2 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
294 ======= |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
295 1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
296 >>>>>>> other |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
297 $ tellmeabout b |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
298 b 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
|
299 <<<<<<< local |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
300 2 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
301 ======= |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
302 1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
303 >>>>>>> other |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
304 $ tellmeabout c |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
305 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
|
306 x |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
307 $ tellmeabout d |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
308 d is a symlink: |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
309 d -> 2 |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
310 $ tellmeabout e |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
311 e is a symlink: |
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
312 e -> x |
18337
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
313 $ tellmeabout f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
314 f is a symlink: |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
315 f -> 2 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
316 $ tellmeabout g |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
317 g is a symlink: |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
318 g -> x |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
319 $ tellmeabout h |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
320 h is a symlink: |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
321 h -> 2 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
322 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
323 $ hg up -Cqr1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
324 $ hg merge |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
325 merging a |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
326 warning: conflicts during merge. |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
327 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
|
328 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
|
329 merging b |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
330 warning: conflicts during merge. |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
331 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
|
332 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
|
333 merging d |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
334 warning: internal:merge cannot merge symlinks for d |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
335 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
|
336 merging f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
337 warning: internal:merge cannot merge symlinks for f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
338 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
|
339 merging h |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
340 warning: internal:merge cannot merge symlinks for h |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
341 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
|
342 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
|
343 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
|
344 [1] |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
345 $ tellmeabout a |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
346 a is a plain file with content: |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
347 <<<<<<< local |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
348 1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
349 ======= |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
350 2 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
351 >>>>>>> other |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
352 $ tellmeabout b |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
353 b is an executable file with content: |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
354 <<<<<<< local |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
355 1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
356 ======= |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
357 2 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
358 >>>>>>> other |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
359 $ tellmeabout c |
20897
0b50788c160c
merge: use ancestor filename from planning phase instead of filectx ancestor
Mads Kiilerich <madski@unity3d.com>
parents:
18605
diff
changeset
|
360 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
|
361 x |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
362 $ tellmeabout d |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
363 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
|
364 1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
365 $ tellmeabout e |
18338
384df4db6520
merge: merge file flags together with file content
Mads Kiilerich <mads@kiilerich.com>
parents:
18337
diff
changeset
|
366 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
|
367 x (no-eol) |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
368 $ tellmeabout f |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
369 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
|
370 1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
371 $ tellmeabout g |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
372 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
|
373 x (no-eol) |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
374 $ tellmeabout h |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
375 h is a symlink: |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
376 h -> 1 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
377 |
557c8522aec0
tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents:
18334
diff
changeset
|
378 $ cd .. |