Show More
@@ -1,88 +1,88 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | set -e |
|
4 | 4 | set -x |
|
5 | 5 | |
|
6 | 6 | # skip commit logs |
|
7 | export HGMERGE=tkmerge | |
|
8 | export EDITOR=true | |
|
7 | HGMERGE=tkmerge; export HGMERGE | |
|
8 | EDITOR=true; export EDITOR | |
|
9 | 9 | |
|
10 | 10 | rm -rf m m1 m2 |
|
11 | 11 | mkdir m |
|
12 | 12 | cd m |
|
13 | 13 | |
|
14 | 14 | echo "m this that" |
|
15 | 15 | echo "this" > a |
|
16 | 16 | echo "that" > b |
|
17 | 17 | hg init |
|
18 | 18 | hg addremove |
|
19 | 19 | hg commit |
|
20 | 20 | echo "a:" `hg dump a` "b:" `hg dump b` |
|
21 | 21 | echo |
|
22 | 22 | |
|
23 | 23 | cd .. |
|
24 | 24 | echo "m2 this that " |
|
25 | 25 | mkdir m2 |
|
26 | 26 | cd m2 |
|
27 | 27 | hg branch ../m |
|
28 | 28 | hg checkout |
|
29 | 29 | echo "a:" `hg dump a` "b:" `hg dump b` |
|
30 | 30 | echo |
|
31 | 31 | |
|
32 | 32 | cd ../m |
|
33 | 33 | echo "m this1 that " |
|
34 | 34 | echo "this1" > a |
|
35 | 35 | hg commit |
|
36 | 36 | echo "a:" `hg dump a` "b:" `hg dump b` |
|
37 | 37 | echo |
|
38 | 38 | |
|
39 | 39 | cd .. |
|
40 | 40 | echo "m1 this1 that " |
|
41 | 41 | mkdir m1 |
|
42 | 42 | cd m1 |
|
43 | 43 | hg branch ../m |
|
44 | 44 | hg checkout |
|
45 | 45 | echo "a:" `hg dump a` "b:" `hg dump b` |
|
46 | 46 | echo |
|
47 | 47 | |
|
48 | 48 | cd ../m1 |
|
49 | 49 | echo "m1 this1 that1" |
|
50 | 50 | echo "that1" > b |
|
51 | 51 | hg commit |
|
52 | 52 | echo "a:" `hg dump a` "b:" `hg dump b` |
|
53 | 53 | echo |
|
54 | 54 | |
|
55 | 55 | cd ../m2 |
|
56 | 56 | echo "m2 this that2" |
|
57 | 57 | echo "that2" > b |
|
58 | 58 | hg commit |
|
59 | 59 | echo "a:" `hg dump a` "b:" `hg dump b` |
|
60 | 60 | echo |
|
61 | 61 | |
|
62 | 62 | cd ../m1 |
|
63 | 63 | echo "m1:m2 this1 that1 that2" |
|
64 | 64 | hg merge ../m2 # b should conflict, a should be fine |
|
65 | 65 | echo "a:" `hg dump a` "b:" `hg dump b` |
|
66 | 66 | echo |
|
67 | 67 | |
|
68 | 68 | cd ../m2 |
|
69 | 69 | echo "m2 this2 that2" |
|
70 | 70 | echo "this2" > a |
|
71 | 71 | hg commit |
|
72 | 72 | echo "a:" `hg dump a` "b:" `hg dump b` |
|
73 | 73 | echo |
|
74 | 74 | |
|
75 | 75 | cd ../m2 |
|
76 | 76 | echo "m2:m this12 that2" |
|
77 | 77 | hg merge ../m # a should conflict, b should be fine |
|
78 | 78 | echo "a:" `hg dump a` "b:" `hg dump b` |
|
79 | 79 | echo |
|
80 | 80 | |
|
81 | 81 | # now here's the interesting bit |
|
82 | 82 | # if we choose ancestor by file, no conflicts |
|
83 | 83 | # otherwise we've got two equally close ancestors, each with a conflict |
|
84 | 84 | # if we go back to the root, we'll have both conflicts again |
|
85 | 85 | echo "m2:m1 this12 that12" |
|
86 | 86 | hg merge ../m1 # should be clean |
|
87 | 87 | echo "a:" `hg dump a` "b:" `hg dump b` |
|
88 | 88 | echo |
General Comments 0
You need to be logged in to leave comments.
Login now