Mercurial > evolve
comparison tests/test-touch.t @ 6072:5c921c26dc40 mercurial-4.9
test-compat: merge mercurial-5.0 into mercurial-4.9
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 12 Oct 2021 13:29:56 +0300 |
| parents | 3fdfeca7e45f 1a13ac9ef30a |
| children |
comparison
equal
deleted
inserted
replaced
| 6071:e82ad19eb3cc | 6072:5c921c26dc40 |
|---|---|
| 297 |\ | 297 |\ |
| 298 ~ ~ | 298 ~ ~ |
| 299 x 3: merge | 299 x 3: merge |
| 300 |\ | 300 |\ |
| 301 ~ ~ | 301 ~ ~ |
| 302 $ hg debugpathcopies 'min(desc("base"))' 'min(desc("merge"))' | 302 $ hg status --copies --rev 'min(desc("base"))' --rev 'min(desc("merge"))' |
| 303 base -> copy-on-left | 303 A copy-on-left |
| 304 base -> copy-on-right | 304 base |
| 305 $ hg debugpathcopies 'min(desc("base"))' 'max(desc("merge"))' | 305 A copy-on-right |
| 306 base -> copy-on-left | 306 base |
| 307 base -> copy-on-right | 307 A left |
| 308 $ hg debugpathcopies 'min(desc("left"))' 'min(desc("merge"))' | 308 A merge-copy-left |
| 309 base -> copy-on-right | 309 A merge-copy-right |
| 310 left -> merge-copy-left | 310 A right |
| 311 $ hg debugpathcopies 'min(desc("left"))' 'max(desc("merge"))' | 311 $ hg status --copies --rev 'min(desc("base"))' --rev 'max(desc("merge"))' |
| 312 base -> copy-on-right | 312 A copy-on-left |
| 313 left -> merge-copy-left | 313 base |
| 314 $ hg debugpathcopies 'min(desc("right"))' 'min(desc("merge"))' | 314 A copy-on-right |
| 315 base -> copy-on-left | 315 base |
| 316 right -> merge-copy-right | 316 A left |
| 317 $ hg debugpathcopies 'min(desc("right"))' 'max(desc("merge"))' | 317 A merge-copy-left |
| 318 base -> copy-on-left | 318 A merge-copy-right |
| 319 right -> merge-copy-right | 319 A right |
| 320 $ hg status --copies --rev 'min(desc("left"))' --rev 'min(desc("merge"))' | |
| 321 M copy-on-left | |
| 322 A copy-on-right | |
| 323 base | |
| 324 A merge-copy-left | |
| 325 left | |
| 326 A merge-copy-right | |
| 327 A right | |
| 328 $ hg status --copies --rev 'min(desc("left"))' --rev 'max(desc("merge"))' | |
| 329 M copy-on-left | |
| 330 A copy-on-right | |
| 331 base | |
| 332 A merge-copy-left | |
| 333 left | |
| 334 A merge-copy-right | |
| 335 A right | |
| 336 $ hg status --copies --rev 'min(desc("right"))' --rev 'min(desc("merge"))' | |
| 337 M copy-on-right | |
| 338 A copy-on-left | |
| 339 base | |
| 340 A left | |
| 341 A merge-copy-left | |
| 342 A merge-copy-right | |
| 343 right | |
| 344 $ hg status --copies --rev 'min(desc("right"))' --rev 'max(desc("merge"))' | |
| 345 M copy-on-right | |
| 346 A copy-on-left | |
| 347 base | |
| 348 A left | |
| 349 A merge-copy-left | |
| 350 A merge-copy-right | |
| 351 right | |
| 320 $ cd .. | 352 $ cd .. |
| 321 | 353 |
| 322 Make sure touch doesn't fail to warn about divergence (issue6107) | 354 Make sure touch doesn't fail to warn about divergence (issue6107) |
| 323 | 355 |
| 324 $ hg init touchdiv | 356 $ hg init touchdiv |