Mercurial > hg

comparison tests/test-pull-update @ 5125:90be02035993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 06 Aug 2007 20:31:15 +0200
parents 73fdc8bd3ed8
children
comparison
equal deleted inserted replaced
5124:a2c11f49e989 5125:90be02035993
1 #!/bin/sh
2 #
3
4 hg init t
5 cd t
6 echo 1 > foo
7 hg ci -Am m
8
9 cd ..
10 hg clone t tt
11 cd tt
12 echo 1.1 > foo
13 hg ci -Am m
14
15 cd ../t
16 echo 1.2 > foo
17 hg ci -Am m
18 echo % should fail
19 hg pull -u ../tt
20
21 cd ../tt
22 echo % should fail
23 hg pull -u ../t
24 HGMERGE=true hg merge
25 hg ci -mm
26
27 cd ../t
28 echo % should work
29 hg pull -u ../tt