Mercurial > hg

comparison tests/test-up-local-change @ 800:ec85f9e6f3b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 15:19:43 +0100
parents 445970ccf57a
children 8f5637f0a0c0
comparison
equal deleted inserted replaced
799:583e290e4945 800:ec85f9e6f3b1
1 #!/bin/sh 1 #!/bin/sh
2 2
3 set -ex 3 set -e
4 mkdir r1 4 mkdir r1
5 cd r1 5 cd r1
6 hg init 6 hg init
7 echo a > a 7 echo a > a
8 hg addremove 8 hg addremove
11 hg clone . ../r2 11 hg clone . ../r2
12 cd ../r2 12 cd ../r2
13 hg up 13 hg up
14 echo abc > a 14 echo abc > a
15 hg diff > ../d 15 hg diff > ../d
16 sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d 16 sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
17 17
18 cd ../r1 18 cd ../r1
19 echo b > b 19 echo b > b
20 echo a2 > a 20 echo a2 > a
21 hg addremove 21 hg addremove
27 hg --debug up 27 hg --debug up
28 hg --debug up -m 28 hg --debug up -m
29 hg parents 29 hg parents
30 hg -v history 30 hg -v history
31 hg diff > ../d 31 hg diff > ../d
32 sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d 32 sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
33 33