Mercurial > hg

diff 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
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-pull-update	Mon Aug 06 20:31:15 2007 +0200
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+
+hg init t
+cd t
+echo 1 > foo
+hg ci -Am m
+
+cd ..
+hg clone t tt
+cd tt
+echo 1.1 > foo
+hg ci -Am m
+
+cd ../t
+echo 1.2 > foo
+hg ci -Am m
+echo % should fail
+hg pull -u ../tt
+
+cd ../tt
+echo % should fail
+hg pull -u ../t
+HGMERGE=true hg merge
+hg ci -mm
+
+cd ../t
+echo % should work
+hg pull -u ../tt