Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 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 c5df1a9c5276
children 61ed30e82b27
comparison
equal deleted inserted replaced
748:c5df1a9c5276 749:7e4843b7efd2
1 + mkdir r1 1 + mkdir r1
2 + cd r1 2 + cd r1
3 + hg init 3 + hg init
4 + echo a 4 + echo a
5 + hg addremove 5 + hg addremove
6 + hg commit -t 1 -u test -d '0 0' 6 + hg commit -m 1 -d '0 0'
7 + hg clone . ../r2 7 + hg clone . ../r2
8 + cd ../r2 8 + cd ../r2
9 + hg up 9 + hg up
10 + echo abc 10 + echo abc
11 + hg diff 11 + hg diff
18 +abc 18 +abc
19 + cd ../r1 19 + cd ../r1
20 + echo b 20 + echo b
21 + echo a2 21 + echo a2
22 + hg addremove 22 + hg addremove
23 + hg commit -t 2 -u test -d '0 0' 23 + hg commit -m 2 -d '0 0'
24 + cd ../r2 24 + cd ../r2
25 + hg -q pull ../r1 25 + hg -q pull ../r1
26 + hg status 26 + hg status
27 M a 27 M a
28 + hg --debug up 28 + hg --debug up