Mercurial > hg
comparison tests/test-mv-cp-st-diff @ 6425:2d9328a2f81f
copies: skip directory rename checks when not merging
The directory rename checks are not meaningful unless we're moving or copying
files across a branch during a merge.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 29 Mar 2008 12:39:47 -0500 |
parents | 90a4329a6b4a |
children | 3f4f14eab085 |
comparison
equal
deleted
inserted
replaced
6424:d8f44384c3ee | 6425:2d9328a2f81f |
---|---|
9 cd t | 9 cd t |
10 | 10 |
11 # set up a boring main branch | 11 # set up a boring main branch |
12 add a a | 12 add a a |
13 hg add a | 13 hg add a |
14 mkdir x | |
15 add x/x x | |
16 hg add x/x | |
14 hg ci -m0 | 17 hg ci -m0 |
15 | 18 |
16 add a m1 | 19 add a m1 |
17 hg ci -m1 | 20 hg ci -m1 |
18 | 21 |
19 add a m2 | 22 add a m2 |
23 add x/y y1 | |
24 hg add x/y | |
20 hg ci -m2 | 25 hg ci -m2 |
21 | 26 |
22 show() | 27 show() |
23 { | 28 { |
24 echo "- $2: $1" | 29 echo "- $2: $1" |
57 show "--rev 2 --rev ." "branch to parent" | 62 show "--rev 2 --rev ." "branch to parent" |
58 show "--rev . --rev 2" "parent to branch" | 63 show "--rev . --rev 2" "parent to branch" |
59 echo | 64 echo |
60 } | 65 } |
61 | 66 |
67 | |
62 tb "add a a1" "add a a2" "hg mv a b" "rename in working dir" | 68 tb "add a a1" "add a a2" "hg mv a b" "rename in working dir" |
63 tb "add a a1" "add a a2" "hg cp a b" "copy in working dir" | 69 tb "add a a1" "add a a2" "hg cp a b" "copy in working dir" |
64 tb "hg mv a b" "add b b1" "add b w" "single rename" | 70 tb "hg mv a b" "add b b1" "add b w" "single rename" |
65 tb "hg cp a b" "add b b1" "add a w" "single copy" | 71 tb "hg cp a b" "add b b1" "add a w" "single copy" |
66 tb "hg mv a b" "hg mv b c" "hg mv c d" "rename chain" | 72 tb "hg mv a b" "hg mv b c" "hg mv c d" "rename chain" |
67 tb "hg cp a b" "hg cp b c" "hg cp c d" "copy chain" | 73 tb "hg cp a b" "hg cp b c" "hg cp c d" "copy chain" |
68 tb "add a a1" "hg mv a b" "hg mv b a" "circular rename" | 74 tb "add a a1" "hg mv a b" "hg mv b a" "circular rename" |
75 | |
76 tb "hg mv x y" "add y/x x1" "add y/x x2" "directory move" |