Mercurial > hg
comparison tests/test-mv-cp-st-diff @ 8518:3f4f14eab085
update --clean: do not unlink added files (issue575)
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 19 May 2009 03:59:58 +0200 |
| parents | 2d9328a2f81f |
| children | 83cfa1baf8ad |
comparison
equal
deleted
inserted
replaced
| 8517:110763cc3ab0 | 8518:3f4f14eab085 |
|---|---|
| 21 | 21 |
| 22 add a m2 | 22 add a m2 |
| 23 add x/y y1 | 23 add x/y y1 |
| 24 hg add x/y | 24 hg add x/y |
| 25 hg ci -m2 | 25 hg ci -m2 |
| 26 cd .. | |
| 26 | 27 |
| 27 show() | 28 show() |
| 28 { | 29 { |
| 29 echo "- $2: $1" | 30 echo "- $2: $1" |
| 30 hg st -C $1 | 31 hg st -C $1 |
| 39 # $2 - second commit | 40 # $2 - second commit |
| 40 # $3 - working dir action | 41 # $3 - working dir action |
| 41 # $4 - test description | 42 # $4 - test description |
| 42 tb() | 43 tb() |
| 43 { | 44 { |
| 45 hg clone t t2 ; cd t2 | |
| 44 hg co -q -C 0 | 46 hg co -q -C 0 |
| 45 | 47 |
| 46 add a $count | 48 add a $count |
| 47 count=`expr $count + 1` | 49 count=`expr $count + 1` |
| 48 hg ci -m "t0" | 50 hg ci -m "t0" |
| 60 show "--rev 0 --rev ." "root to parent" | 62 show "--rev 0 --rev ." "root to parent" |
| 61 show "--rev . --rev 0" "parent to root" | 63 show "--rev . --rev 0" "parent to root" |
| 62 show "--rev 2 --rev ." "branch to parent" | 64 show "--rev 2 --rev ." "branch to parent" |
| 63 show "--rev . --rev 2" "parent to branch" | 65 show "--rev . --rev 2" "parent to branch" |
| 64 echo | 66 echo |
| 67 cd .. | |
| 68 rm -rf t2 | |
| 65 } | 69 } |
| 66 | 70 |
| 67 | 71 |
| 68 tb "add a a1" "add a a2" "hg mv a b" "rename in working dir" | 72 tb "add a a1" "add a a2" "hg mv a b" "rename in working dir" |
| 69 tb "add a a1" "add a a2" "hg cp a b" "copy in working dir" | 73 tb "add a a1" "add a a2" "hg cp a b" "copy in working dir" |