Show More
@@ -378,6 +378,32 b' of the merge to the merge should include' | |||||
378 | $ hg debugpathcopies 1 3 |
|
378 | $ hg debugpathcopies 1 3 | |
379 | x -> z |
|
379 | x -> z | |
380 |
|
380 | |||
|
381 | Copy x->y on two separate branches. Pathcopies from one branch to the other | |||
|
382 | should not report the copy. | |||
|
383 | $ newrepo | |||
|
384 | $ echo x > x | |||
|
385 | $ hg ci -Aqm 'add x' | |||
|
386 | $ hg cp x y | |||
|
387 | $ hg ci -qm 'copy x to y' | |||
|
388 | $ hg co -q 0 | |||
|
389 | $ hg graft 1 -q | |||
|
390 | $ hg l | |||
|
391 | @ 2 copy x to y | |||
|
392 | | y | |||
|
393 | | o 1 copy x to y | |||
|
394 | |/ y | |||
|
395 | o 0 add x | |||
|
396 | x | |||
|
397 | $ hg debugp1copies -r 1 | |||
|
398 | x -> y | |||
|
399 | $ hg debugp1copies -r 2 | |||
|
400 | x -> y | |||
|
401 | BROKEN: These two should not report any copies | |||
|
402 | $ hg debugpathcopies 1 2 | |||
|
403 | x -> y | |||
|
404 | $ hg debugpathcopies 2 1 | |||
|
405 | x -> y | |||
|
406 | ||||
381 | Copy x to y on one side of merge, create y and rename to z on the other side. |
|
407 | Copy x to y on one side of merge, create y and rename to z on the other side. | |
382 | $ newrepo |
|
408 | $ newrepo | |
383 | $ echo x > x |
|
409 | $ echo x > x |
General Comments 0
You need to be logged in to leave comments.
Login now