Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change @ 749:7e4843b7efd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update tests to use commit -m and default -u manifest hash: 6e4385453843031a712005a320d6000595b40d05
author mpm@selenic.com
date Thu, 21 Jul 2005 15:05:17 -0500
parents eb46971fc57f
children 6592c4f5cd4f 445970ccf57a
comparison
equal deleted inserted replaced
748:c5df1a9c5276 749:7e4843b7efd2
1 #!/bin/sh 1 #!/bin/sh
2
3 export HGMERGE=true
4 2
5 set -ex 3 set -ex
6 mkdir r1 4 mkdir r1
7 cd r1 5 cd r1
8 hg init 6 hg init
9 echo a > a 7 echo a > a
10 hg addremove 8 hg addremove
11 hg commit -t "1" -u test -d "0 0" 9 hg commit -m "1" -d "0 0"
12 10
13 hg clone . ../r2 11 hg clone . ../r2
14 cd ../r2 12 cd ../r2
15 hg up 13 hg up
16 echo abc > a 14 echo abc > a
19 17
20 cd ../r1 18 cd ../r1
21 echo b > b 19 echo b > b
22 echo a2 > a 20 echo a2 > a
23 hg addremove 21 hg addremove
24 hg commit -t "2" -u test -d "0 0" 22 hg commit -m "2" -d "0 0"
25 23
26 cd ../r2 24 cd ../r2
27 hg -q pull ../r1 25 hg -q pull ../r1
28 hg status 26 hg status
29 hg --debug up 27 hg --debug up