Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-addremove @ 3044:fcadf7a32425
Merge with mpm
author | Josef "Jeff" Sipek <jeffpc@josefsipek.net> |
---|---|
date | Sun, 03 Sep 2006 06:06:02 -0400 |
parents | ff3ea21a981a |
children | f975e986b4bf |
comparison
equal
deleted
inserted
replaced
3043:2a4d4aecb2b4 | 3044:fcadf7a32425 |
---|---|
8 hg -v commit -m "add 1" -d "1000000 0" | 8 hg -v commit -m "add 1" -d "1000000 0" |
9 cd dir/ | 9 cd dir/ |
10 touch ../foo_2 bar_2 | 10 touch ../foo_2 bar_2 |
11 hg -v addremove | 11 hg -v addremove |
12 hg -v commit -m "add 2" -d "1000000 0" | 12 hg -v commit -m "add 2" -d "1000000 0" |
13 | |
14 cd .. | |
15 hg init sim | |
16 cd sim | |
17 echo a > a | |
18 echo a >> a | |
19 echo a >> a | |
20 echo c > c | |
21 hg commit -Ama | |
22 mv a b | |
23 rm c | |
24 echo d > d | |
25 hg addremove -s 0.5 | |
26 hg commit -mb |