Mercurial > hg
annotate tests/test-merge-tools.out @ 7746:59815cef38f0
hgk: added colour settings for different colours in diff view
| author | Robert Bauck Hamar <r.b.hamar@usit.uio.no> |
|---|---|
| date | Mon, 09 Feb 2009 19:00:52 +0100 |
| parents | 3793802ea41b |
| children | 8c06d4bf2c23 |
| rev | line source |
|---|---|
| 7731 | 1 # revision 0 |
| 2 adding f | |
| 3 # revision 1 | |
| 4 # revision 2 | |
| 5 created new head | |
| 6 # revision 3 - simple to merge | |
| 7 created new head | |
| 8 | |
| 9 | |
| 10 Tool selection | |
| 11 | |
| 12 # default is internal merge: | |
| 13 [merge-tools] | |
| 14 # hg update -C 1 | |
| 15 # hg merge -r 2 | |
| 16 merging f | |
| 17 warning: conflicts during merge. | |
| 18 merging f failed! | |
| 19 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 20 use 'hg resolve' to retry unresolved file merges | |
| 21 # cat f | |
| 22 <<<<<<< local | |
| 23 revision 1 | |
| 24 ======= | |
| 25 revision 2 | |
| 26 >>>>>>> other | |
| 27 space | |
| 28 # hg stat | |
| 29 M f | |
| 30 ? f.orig | |
| 31 | |
| 32 # simplest hgrc using false for merge: | |
| 33 [merge-tools] | |
| 34 false.whatever= | |
| 35 # hg update -C 1 | |
| 36 # hg merge -r 2 | |
| 37 merging f | |
| 38 merging f failed! | |
| 39 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 40 use 'hg resolve' to retry unresolved file merges | |
| 41 # cat f | |
| 42 revision 1 | |
| 43 space | |
| 44 # hg stat | |
| 45 M f | |
| 46 ? f.orig | |
| 47 | |
| 48 # true with higher .priority gets precedence: | |
| 49 [merge-tools] | |
| 50 false.whatever= | |
| 51 true.priority=1 | |
| 52 # hg update -C 1 | |
| 53 # hg merge -r 2 | |
| 54 merging f | |
| 55 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 56 (branch merge, don't forget to commit) | |
| 57 # cat f | |
| 58 revision 1 | |
| 59 space | |
| 60 # hg stat | |
| 61 M f | |
| 62 | |
| 63 # unless lowered on command line: | |
| 64 [merge-tools] | |
| 65 false.whatever= | |
| 66 true.priority=1 | |
| 67 # hg update -C 1 | |
| 68 # hg merge -r 2 --config merge-tools.true.priority=-7 | |
| 69 merging f | |
| 70 merging f failed! | |
| 71 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 72 use 'hg resolve' to retry unresolved file merges | |
| 73 # cat f | |
| 74 revision 1 | |
| 75 space | |
| 76 # hg stat | |
| 77 M f | |
| 78 ? f.orig | |
| 79 | |
| 80 # or false set higher on command line: | |
| 81 [merge-tools] | |
| 82 false.whatever= | |
| 83 true.priority=1 | |
| 84 # hg update -C 1 | |
| 85 # hg merge -r 2 --config merge-tools.false.priority=117 | |
| 86 merging f | |
| 87 merging f failed! | |
| 88 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 89 use 'hg resolve' to retry unresolved file merges | |
| 90 # cat f | |
| 91 revision 1 | |
| 92 space | |
| 93 # hg stat | |
| 94 M f | |
| 95 ? f.orig | |
| 96 | |
| 97 # or true.executable not found in PATH: | |
| 98 [merge-tools] | |
| 99 false.whatever= | |
| 100 true.priority=1 | |
| 101 # hg update -C 1 | |
| 102 # hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool | |
| 103 merging f | |
| 104 merging f failed! | |
| 105 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 106 use 'hg resolve' to retry unresolved file merges | |
| 107 # cat f | |
| 108 revision 1 | |
| 109 space | |
| 110 # hg stat | |
| 111 M f | |
| 112 ? f.orig | |
| 113 | |
| 114 # or true.executable with bogus path: | |
| 115 [merge-tools] | |
| 116 false.whatever= | |
| 117 true.priority=1 | |
| 118 # hg update -C 1 | |
| 119 # hg merge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool | |
| 120 merging f | |
| 121 merging f failed! | |
| 122 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 123 use 'hg resolve' to retry unresolved file merges | |
| 124 # cat f | |
| 125 revision 1 | |
| 126 space | |
| 127 # hg stat | |
| 128 M f | |
| 129 ? f.orig | |
| 130 | |
| 131 # but true.executable set to cat found in PATH works: | |
| 132 [merge-tools] | |
| 133 false.whatever= | |
| 134 true.priority=1 | |
| 135 true.executable=cat | |
| 136 # hg update -C 1 | |
| 137 # hg merge -r 2 | |
| 138 revision 1 | |
| 139 space | |
| 140 revision 0 | |
| 141 space | |
| 142 revision 2 | |
| 143 space | |
| 144 merging f | |
| 145 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 146 (branch merge, don't forget to commit) | |
| 147 # cat f | |
| 148 revision 1 | |
| 149 space | |
| 150 # hg stat | |
| 151 M f | |
| 152 | |
| 153 # and true.executable set to cat with path works: | |
| 154 [merge-tools] | |
| 155 false.whatever= | |
| 156 true.priority=1 | |
| 157 true.executable=cat | |
| 158 # hg update -C 1 | |
| 159 # hg merge -r 2 --config merge-tools.true.executable=/bin/cat | |
| 160 revision 1 | |
| 161 space | |
| 162 revision 0 | |
| 163 space | |
| 164 revision 2 | |
| 165 space | |
| 166 merging f | |
| 167 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 168 (branch merge, don't forget to commit) | |
| 169 # cat f | |
| 170 revision 1 | |
| 171 space | |
| 172 # hg stat | |
| 173 M f | |
| 174 | |
| 175 | |
| 176 Tool selection and merge-patterns | |
| 177 | |
| 178 # merge-patterns specifies new tool tac: | |
| 179 [merge-tools] | |
| 180 false.whatever= | |
| 181 true.priority=1 | |
| 182 true.executable=cat | |
| 183 # hg update -C 1 | |
| 184 # hg merge -r 2 --config merge-patterns.f=tac | |
| 185 space | |
| 186 revision 1 | |
| 187 space | |
| 188 revision 0 | |
| 189 space | |
| 190 revision 2 | |
| 191 merging f | |
| 192 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 193 (branch merge, don't forget to commit) | |
| 194 # cat f | |
| 195 revision 1 | |
| 196 space | |
| 197 # hg stat | |
| 198 M f | |
| 199 | |
| 200 # merge-patterns specifies executable not found in PATH and gets warning: | |
| 201 [merge-tools] | |
| 202 false.whatever= | |
| 203 true.priority=1 | |
| 204 true.executable=cat | |
| 205 # hg update -C 1 | |
| 206 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool | |
| 207 couldn't find merge tool true specified for f | |
| 208 merging f | |
| 209 merging f failed! | |
| 210 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 211 use 'hg resolve' to retry unresolved file merges | |
| 212 # cat f | |
| 213 revision 1 | |
| 214 space | |
| 215 # hg stat | |
| 216 M f | |
| 217 ? f.orig | |
| 218 | |
| 219 # merge-patterns specifies executable with bogus path and gets warning: | |
| 220 [merge-tools] | |
| 221 false.whatever= | |
| 222 true.priority=1 | |
| 223 true.executable=cat | |
| 224 # hg update -C 1 | |
| 225 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool | |
|
7732
3793802ea41b
Make util.find_exe alway returns existing file, fixing issue1459
Mads Kiilerich <mads@kiilerich.com>
parents:
7731
diff
changeset
|
226 couldn't find merge tool true specified for f |
| 7731 | 227 merging f |
| 228 merging f failed! | |
| 229 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 230 use 'hg resolve' to retry unresolved file merges | |
| 231 # cat f | |
| 232 revision 1 | |
| 233 space | |
| 234 # hg stat | |
| 235 M f | |
| 236 ? f.orig | |
| 237 | |
| 238 | |
| 239 Premerge | |
| 240 | |
| 241 # Default is silent simplemerge: | |
| 242 [merge-tools] | |
| 243 false.whatever= | |
| 244 true.priority=1 | |
| 245 true.executable=cat | |
| 246 # hg update -C 1 | |
| 247 # hg merge -r 3 | |
| 248 merging f | |
| 249 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 250 (branch merge, don't forget to commit) | |
| 251 # cat f | |
| 252 revision 1 | |
| 253 space | |
| 254 revision 3 | |
| 255 # hg stat | |
| 256 M f | |
| 257 | |
| 258 # .premerge=True is same: | |
| 259 [merge-tools] | |
| 260 false.whatever= | |
| 261 true.priority=1 | |
| 262 true.executable=cat | |
| 263 # hg update -C 1 | |
| 264 # hg merge -r 3 --config merge-tools.true.premerge=True | |
| 265 merging f | |
| 266 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 267 (branch merge, don't forget to commit) | |
| 268 # cat f | |
| 269 revision 1 | |
| 270 space | |
| 271 revision 3 | |
| 272 # hg stat | |
| 273 M f | |
| 274 | |
| 275 # .premerge=False executes merge-tool: | |
| 276 [merge-tools] | |
| 277 false.whatever= | |
| 278 true.priority=1 | |
| 279 true.executable=cat | |
| 280 # hg update -C 1 | |
| 281 # hg merge -r 3 --config merge-tools.true.premerge=False | |
| 282 revision 1 | |
| 283 space | |
| 284 revision 0 | |
| 285 space | |
| 286 revision 0 | |
| 287 space | |
| 288 revision 3 | |
| 289 merging f | |
| 290 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 291 (branch merge, don't forget to commit) | |
| 292 # cat f | |
| 293 revision 1 | |
| 294 space | |
| 295 # hg stat | |
| 296 M f | |
| 297 | |
| 298 | |
| 299 Tool execution | |
| 300 | |
| 301 # set tools.args explicit to include $base $local $other $output: | |
| 302 [merge-tools] | |
| 303 false.whatever= | |
| 304 true.priority=1 | |
| 305 true.executable=cat | |
| 306 # hg update -C 1 | |
| 307 ==> ... <== | |
| 308 revision 0 | |
| 309 space | |
| 310 | |
| 311 ==> ... <== | |
| 312 revision 1 | |
| 313 space | |
| 314 | |
| 315 ==> ... <== | |
| 316 revision 2 | |
| 317 space | |
| 318 | |
| 319 ==> ... <== | |
| 320 revision 1 | |
| 321 space | |
| 322 merging f | |
| 323 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 324 (branch merge, don't forget to commit) | |
| 325 # cat f | |
| 326 revision 1 | |
| 327 space | |
| 328 # hg stat | |
| 329 M f | |
| 330 | |
| 331 # Merge with "echo mergeresult > $local": | |
| 332 [merge-tools] | |
| 333 false.whatever= | |
| 334 true.priority=1 | |
| 335 true.executable=cat | |
| 336 # hg update -C 1 | |
| 337 merging f | |
| 338 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 339 (branch merge, don't forget to commit) | |
| 340 # cat f | |
| 341 mergeresult | |
| 342 # hg stat | |
| 343 M f | |
| 344 | |
| 345 # - and $local is the file f: | |
| 346 [merge-tools] | |
| 347 false.whatever= | |
| 348 true.priority=1 | |
| 349 true.executable=cat | |
| 350 # hg update -C 1 | |
| 351 merging f | |
| 352 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 353 (branch merge, don't forget to commit) | |
| 354 # cat f | |
| 355 mergeresult | |
| 356 # hg stat | |
| 357 M f | |
| 358 | |
| 359 # Merge with "echo mergeresult > $output" - the variable is a bit magic: | |
| 360 [merge-tools] | |
| 361 false.whatever= | |
| 362 true.priority=1 | |
| 363 true.executable=cat | |
| 364 # hg update -C 1 | |
| 365 merging f | |
| 366 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 367 (branch merge, don't forget to commit) | |
| 368 # cat f | |
| 369 mergeresult | |
| 370 # hg stat | |
| 371 M f | |
| 372 | |
| 373 | |
| 374 Merge post-processing | |
| 375 | |
| 376 # cat is a bad merge-tool and doesn't change: | |
| 377 [merge-tools] | |
| 378 false.whatever= | |
| 379 true.priority=1 | |
| 380 true.executable=cat | |
| 381 # hg update -C 1 | |
| 382 # hg merge -r 2 --config merge-tools.true.checkchanged=1 | |
| 383 revision 1 | |
| 384 space | |
| 385 revision 0 | |
| 386 space | |
| 387 revision 2 | |
| 388 space | |
| 389 merging f | |
| 390 merging f failed! | |
| 391 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 392 use 'hg resolve' to retry unresolved file merges | |
| 393 # cat f | |
| 394 revision 1 | |
| 395 space | |
| 396 # hg stat | |
| 397 M f | |
| 398 ? f.orig | |
| 399 |