comparison tests/test-mq-qimport @ 7272:9105467b8167

merge with crew
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 28 Oct 2008 00:03:28 +0100
parents 8046f0a070a6 e7f6401584f7
children 84f807918864
comparison
equal deleted inserted replaced
7271:8046f0a070a6 7272:9105467b8167
31 echo foo >> foo 31 echo foo >> foo
32 hg add foo 32 hg add foo
33 hg diff > $HGTMP/url.diff 33 hg diff > $HGTMP/url.diff
34 hg revert --no-backup foo 34 hg revert --no-backup foo
35 rm foo 35 rm foo
36 hg qimport file://$HGTMP/url.diff 36 # Under unix: file:///foobar/blah
37 # Under windows: file:///c:/foobar/blah
38 patchurl=`echo $HGTMP/url.diff | tr '\\' /`
39 expr $patchurl : "\/" > /dev/null
40 if [ $? -ne 0 ]; then
41 patchurl='/'$patchurl
42 fi
43 hg qimport file://$patchurl
37 hg qun 44 hg qun
38 45
39 echo % import patch that already exists 46 echo % import patch that already exists
40 echo foo2 >> foo 47 echo foo2 >> foo
41 hg add foo 48 hg add foo