equal
deleted
inserted
replaced
|
1 Testing recorded "modified" files for merge commit |
|
2 ================================================== |
|
3 |
|
4 This file shows what hg says are "modified" files for a merge commit |
|
5 (hg log -T {files}), somewhat exhaustively. |
|
6 |
|
7 This test file shows merges that involves files contents changing |
|
8 |
|
9 For merges taht involves executable bit changing, check test-merge-combination-exec-bytes.t |
|
10 |
|
11 For testing of multiple corner case, check test-merge-combination-misc.t |
|
12 |
|
13 Case with multiple or zero merge ancestors, copies/renames, and identical file contents |
|
14 with different filelog revisions are not currently covered. |
|
15 |
|
16 $ . $TESTDIR/testlib/merge-combination-util.sh |
|
17 |
|
18 All the merges of various file contents. |
|
19 |
|
20 $ range () { |
|
21 > max=0 |
|
22 > for i in $@; do |
|
23 > if [ $i = - ]; then continue; fi |
|
24 > if [ $i -gt $max ]; then max=$i; fi |
|
25 > done |
|
26 > $TESTDIR/seq.py `expr $max + 1` |
|
27 > } |
|
28 $ isgood () { true; } |
|
29 $ createfile () { |
|
30 > if [ -f a ] && [ "`cat a`" = $1 ] |
|
31 > then touch $file |
|
32 > else echo $v > a |
|
33 > fi |
|
34 > } |
|
35 |
|
36 $ genmerges |
|
37 1111 : agree on "" |
|
38 1112 : agree on "a" |
|
39 111- : agree on "a" |
|
40 1121 : agree on "a" |
|
41 1122 : agree on "" |
|
42 1123 : agree on "a" |
|
43 112- : agree on "a" |
|
44 11-1 : hg said "", expected "a" |
|
45 11-2 : agree on "a" |
|
46 11-- : agree on "" |
|
47 1211 : agree on "a" |
|
48 1212 : agree on "" |
|
49 1213 : agree on "a" |
|
50 121- : agree on "a" |
|
51 1221 : agree on "a" |
|
52 1222 : agree on "" |
|
53 1223 : agree on "a" |
|
54 122- : agree on "a" |
|
55 1231 C: agree on "a" |
|
56 1232 C: agree on "a" |
|
57 1233 C: agree on "a" |
|
58 1234 C: agree on "a" |
|
59 123- C: agree on "a" |
|
60 12-1 C: agree on "a" |
|
61 12-2 C: hg said "", expected "a" |
|
62 12-3 C: agree on "a" |
|
63 12-- C: agree on "a" |
|
64 1-11 : hg said "", expected "a" |
|
65 1-12 : agree on "a" |
|
66 1-1- : agree on "" |
|
67 1-21 C: agree on "a" |
|
68 1-22 C: hg said "", expected "a" |
|
69 1-23 C: agree on "a" |
|
70 1-2- C: agree on "a" |
|
71 1--1 : agree on "a" |
|
72 1--2 : agree on "a" |
|
73 1--- : agree on "" |
|
74 -111 : agree on "" |
|
75 -112 : agree on "a" |
|
76 -11- : agree on "a" |
|
77 -121 C: agree on "a" |
|
78 -122 C: agree on "a" |
|
79 -123 C: agree on "a" |
|
80 -12- C: agree on "a" |
|
81 -1-1 : agree on "" |
|
82 -1-2 : agree on "a" |
|
83 -1-- : agree on "a" |
|
84 --11 : agree on "" |
|
85 --12 : agree on "a" |
|
86 --1- : agree on "a" |
|
87 ---1 : agree on "a" |
|
88 ---- : agree on "" |