111 $ echo This is file b2 > b |
111 $ echo This is file b2 > b |
112 merge should fail |
112 merge should fail |
113 $ hg merge 1 |
113 $ hg merge 1 |
114 b: untracked file differs |
114 b: untracked file differs |
115 abort: untracked files in working directory differ from files in requested revision |
115 abort: untracked files in working directory differ from files in requested revision |
116 [255] |
116 [20] |
117 |
117 |
118 #if symlink |
118 #if symlink |
119 symlinks to directories should be treated as regular files (issue5027) |
119 symlinks to directories should be treated as regular files (issue5027) |
120 $ rm b |
120 $ rm b |
121 $ ln -s 'This is file b2' b |
121 $ ln -s 'This is file b2' b |
122 $ hg merge 1 |
122 $ hg merge 1 |
123 b: untracked file differs |
123 b: untracked file differs |
124 abort: untracked files in working directory differ from files in requested revision |
124 abort: untracked files in working directory differ from files in requested revision |
125 [255] |
125 [20] |
126 symlinks shouldn't be followed |
126 symlinks shouldn't be followed |
127 $ rm b |
127 $ rm b |
128 $ echo This is file b1 > .hg/b |
128 $ echo This is file b1 > .hg/b |
129 $ ln -s .hg/b b |
129 $ ln -s .hg/b b |
130 $ hg merge 1 |
130 $ hg merge 1 |
131 b: untracked file differs |
131 b: untracked file differs |
132 abort: untracked files in working directory differ from files in requested revision |
132 abort: untracked files in working directory differ from files in requested revision |
133 [255] |
133 [20] |
134 |
134 |
135 $ rm b |
135 $ rm b |
136 $ echo This is file b2 > b |
136 $ echo This is file b2 > b |
137 #endif |
137 #endif |
138 |
138 |
142 [30] |
142 [30] |
143 this merge should fail |
143 this merge should fail |
144 $ hg merge 1 --config merge.checkunknown=abort |
144 $ hg merge 1 --config merge.checkunknown=abort |
145 b: untracked file differs |
145 b: untracked file differs |
146 abort: untracked files in working directory differ from files in requested revision |
146 abort: untracked files in working directory differ from files in requested revision |
147 [255] |
147 [20] |
148 |
148 |
149 this merge should warn |
149 this merge should warn |
150 $ hg merge 1 --config merge.checkunknown=warn |
150 $ hg merge 1 --config merge.checkunknown=warn |
151 b: replacing untracked file |
151 b: replacing untracked file |
152 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
152 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
186 remote .hgignore shouldn't be used for determining whether a file is ignored |
186 remote .hgignore shouldn't be used for determining whether a file is ignored |
187 $ echo This is file remoteignored4 > remoteignored |
187 $ echo This is file remoteignored4 > remoteignored |
188 $ hg merge 3 --config merge.checkignored=ignore --config merge.checkunknown=abort |
188 $ hg merge 3 --config merge.checkignored=ignore --config merge.checkunknown=abort |
189 remoteignored: untracked file differs |
189 remoteignored: untracked file differs |
190 abort: untracked files in working directory differ from files in requested revision |
190 abort: untracked files in working directory differ from files in requested revision |
191 [255] |
191 [20] |
192 $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=ignore |
192 $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=ignore |
193 merging .hgignore |
193 merging .hgignore |
194 merging for .hgignore |
194 merging for .hgignore |
195 3 files updated, 1 files merged, 0 files removed, 0 files unresolved |
195 3 files updated, 1 files merged, 0 files removed, 0 files unresolved |
196 (branch merge, don't forget to commit) |
196 (branch merge, don't forget to commit) |
208 $ echo This is file b2 > b |
208 $ echo This is file b2 > b |
209 $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=abort |
209 $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=abort |
210 b: untracked file differs |
210 b: untracked file differs |
211 localignored: untracked file differs |
211 localignored: untracked file differs |
212 abort: untracked files in working directory differ from files in requested revision |
212 abort: untracked files in working directory differ from files in requested revision |
213 [255] |
213 [20] |
214 $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=ignore |
214 $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=ignore |
215 localignored: untracked file differs |
215 localignored: untracked file differs |
216 abort: untracked files in working directory differ from files in requested revision |
216 abort: untracked files in working directory differ from files in requested revision |
217 [255] |
217 [20] |
218 $ hg merge 3 --config merge.checkignored=warn --config merge.checkunknown=abort |
218 $ hg merge 3 --config merge.checkignored=warn --config merge.checkunknown=abort |
219 b: untracked file differs |
219 b: untracked file differs |
220 abort: untracked files in working directory differ from files in requested revision |
220 abort: untracked files in working directory differ from files in requested revision |
221 [255] |
221 [20] |
222 $ hg merge 3 --config merge.checkignored=warn --config merge.checkunknown=warn |
222 $ hg merge 3 --config merge.checkignored=warn --config merge.checkunknown=warn |
223 b: replacing untracked file |
223 b: replacing untracked file |
224 localignored: replacing untracked file |
224 localignored: replacing untracked file |
225 merging .hgignore |
225 merging .hgignore |
226 merging for .hgignore |
226 merging for .hgignore |