##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Fix up test for update flags
Matt Mackall -
r677:204328d3 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,76 +1,78 b''
1 + mkdir r1
1 + mkdir r1
2 + cd r1
2 + cd r1
3 + hg init
3 + hg init
4 + echo a
4 + echo a
5 + hg addremove
5 + hg addremove
6 + hg commit -t 1 -u test -d '0 0'
6 + hg commit -t 1 -u test -d '0 0'
7 + hg clone . ../r2
7 + hg clone . ../r2
8 + cd ../r2
8 + cd ../r2
9 + hg up
9 + hg up
10 + echo abc
10 + echo abc
11 + hg diff
11 + hg diff
12 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
12 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
13 diff -r c19d34741b0a a
13 diff -r c19d34741b0a a
14 --- a/a
14 --- a/a
15 +++ b/a
15 +++ b/a
16 @@ -1,1 +1,1 @@
16 @@ -1,1 +1,1 @@
17 -a
17 -a
18 +abc
18 +abc
19 + cd ../r1
19 + cd ../r1
20 + echo b
20 + echo b
21 + echo a2
21 + echo a2
22 + hg addremove
22 + hg addremove
23 + hg commit -t 2 -u test -d '0 0'
23 + hg commit -t 2 -u test -d '0 0'
24 + cd ../r2
24 + cd ../r2
25 + hg -q pull ../r1
25 + hg -q pull ../r1
26 + hg status
26 + hg status
27 C a
27 C a
28 + hg --debug up
28 + hg --debug up
29 resolving manifests
29 resolving manifests
30 force None allow None moddirstate True linear True
30 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
31 a versions differ, resolve
32 a versions differ, resolve
32 remote created b
33 remote created b
33 getting b
34 getting b
34 merging a
35 merging a
35 resolving a
36 resolving a
36 file a: other d730145abbf9 ancestor b789fdd96dc2
37 file a: other d730145abbf9 ancestor b789fdd96dc2
37 + hg --debug up -m
38 + hg --debug up -m
38 resolving manifests
39 resolving manifests
40 force None allow 1 moddirstate True linear True
39 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
41 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
40 + hg parents
42 + hg parents
41 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
43 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
42 tag: tip
44 tag: tip
43 user: test
45 user: test
44 date: Thu Jan 1 00:00:00 1970
46 date: Thu Jan 1 00:00:00 1970
45 summary: 2
47 summary: 2
46
48
47 + hg -v history
49 + hg -v history
48 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
50 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
49 tag: tip
51 tag: tip
50 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
52 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
51 user: test
53 user: test
52 date: Thu Jan 1 00:00:00 1970
54 date: Thu Jan 1 00:00:00 1970
53 files: a b
55 files: a b
54 description:
56 description:
55 2
57 2
56
58
57
59
58
60
59 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
61 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
60 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
62 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
61 user: test
63 user: test
62 date: Thu Jan 1 00:00:00 1970
64 date: Thu Jan 1 00:00:00 1970
63 files: a
65 files: a
64 description:
66 description:
65 1
67 1
66
68
67
69
68
70
69 + hg diff
71 + hg diff
70 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
72 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
71 diff -r 1e71731e6fbb a
73 diff -r 1e71731e6fbb a
72 --- a/a
74 --- a/a
73 +++ b/a
75 +++ b/a
74 @@ -1,1 +1,1 @@
76 @@ -1,1 +1,1 @@
75 -a2
77 -a2
76 +abc
78 +abc
General Comments 0
You need to be logged in to leave comments. Login now