equal
deleted
inserted
replaced
1 Make sure that the internal merge tools (internal:fail, internal:local, and |
1 Make sure that the internal merge tools (internal:fail, internal:local, |
2 internal:other) are used when matched by a merge-pattern in hgrc |
2 internal:union and internal:other) are used when matched by a |
|
3 merge-pattern in hgrc |
3 |
4 |
4 Make sure HGMERGE doesn't interfere with the test: |
5 Make sure HGMERGE doesn't interfere with the test: |
5 |
6 |
6 $ unset HGMERGE |
7 $ unset HGMERGE |
7 |
8 |
108 third line |
109 third line |
109 |
110 |
110 $ hg stat |
111 $ hg stat |
111 M f |
112 M f |
112 |
113 |
|
114 Merge using internal:union tool: |
|
115 |
|
116 $ hg update -C 2 |
|
117 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
118 |
|
119 $ echo "line 4a" >>f |
|
120 $ hg ci -Am "Adding fourth line (commit 4)" |
|
121 $ hg update 2 |
|
122 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
123 |
|
124 $ echo "line 4b" >>f |
|
125 $ hg ci -Am "Adding fourth line v2 (commit 5)" |
|
126 created new head |
|
127 |
|
128 $ echo "[merge-patterns]" > .hg/hgrc |
|
129 $ echo "* = internal:union" >> .hg/hgrc |
|
130 |
|
131 $ hg merge 3 |
|
132 merging f |
|
133 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
134 (branch merge, don't forget to commit) |
|
135 |
|
136 $ cat f |
|
137 line 1 |
|
138 line 2 |
|
139 third line |
|
140 line 4b |
|
141 line 4a |