Mercurial > hg > pyhgsh

comparison tests/test-up-local-change.out @ 801:1f9ec150a476

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated output of tests.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 15:21:02 +0100
parents 445970ccf57a
children 8f5637f0a0c0
comparison
equal deleted inserted replaced
800:ec85f9e6f3b1 801:1f9ec150a476
1 + mkdir r1
2 + cd r1
3 + hg init 1 + hg init
4 + echo a
5 + hg addremove 2 + hg addremove
6 adding a 3 adding a
7 + hg commit -m 1 -d '0 0' 4 + hg commit -m 1 -d 0 0
8 + hg clone . ../r2 5 + hg clone . ../r2
9 + cd ../r2
10 + hg up 6 + hg up
11 + echo abc
12 + hg diff 7 + hg diff
13 + sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/'
14 diff -r c19d34741b0a a 8 diff -r c19d34741b0a a
15 --- a/a 9 --- a/a
16 +++ b/a 10 +++ b/a
17 @@ -1,1 +1,1 @@ 11 @@ -1,1 +1,1 @@
18 -a 12 -a
19 +abc 13 +abc
20 + cd ../r1
21 + echo b
22 + echo a2
23 + hg addremove 14 + hg addremove
24 adding b 15 adding b
25 + hg commit -m 2 -d '0 0' 16 + hg commit -m 2 -d 0 0
26 + cd ../r2
27 + hg -q pull ../r1 17 + hg -q pull ../r1
28 + hg status 18 + hg status
29 M a 19 M a
30 + hg --debug up 20 + hg --debug up
31 resolving manifests 21 resolving manifests
65 description: 55 description:
66 1 56 1
67 57
68 58
69 + hg diff 59 + hg diff
70 + sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/'
71 diff -r 1e71731e6fbb a 60 diff -r 1e71731e6fbb a
72 --- a/a 61 --- a/a
73 +++ b/a 62 +++ b/a
74 @@ -1,1 +1,1 @@ 63 @@ -1,1 +1,1 @@
75 -a2 64 -a2