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

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

update tests to reflect new short hash length...
mpm@selenic.com -
r374:f07d00fc default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -12,15 +12,15 b''
12 + hg -d up -m 1
12 + hg -d up -m 1
13 merge: warning: conflicts during merge
13 merge: warning: conflicts during merge
14 resolving manifests
14 resolving manifests
15 ancestor 1c6e5a12 local 35fedfab remote a5801785
15 ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
16 a versions differ, resolve
16 a versions differ, resolve
17 working dir created .out, keeping
17 working dir created .out, keeping
18 merging a
18 merging a
19 resolving a
19 resolving a
20 file a: other d7250518 ancestor 68ba9db7
20 file a: other d7250518cb1b ancestor 68ba9db7a9e4
21 merging a failed!
21 merging a failed!
22 + hg id
22 + hg id
23 32e80765+75234512+ tip
23 32e80765d7fe+75234512624c+ tip
24 + cat a
24 + cat a
25 + grep -v '>>>'
25 + grep -v '>>>'
26 + grep -v '<<<'
26 + grep -v '<<<'
Show file before | Show file after | Hide comments
@@ -8,7 +8,7 b' unknown'
8 + hg commit -t test -u test -d '0 0'
8 + hg commit -t test -u test -d '0 0'
9 + hg co
9 + hg co
10 + hg identify
10 + hg identify
11 acb14030 tip
11 acb14030fe0a tip
12 ++ hg -q tip
12 ++ hg -q tip
13 ++ cut -d : -f 2
13 ++ cut -d : -f 2
14 + T=acb14030fe0a21b60322c440ad2d20cf7685a376
14 + T=acb14030fe0a21b60322c440ad2d20cf7685a376
@@ -21,15 +21,15 b' acb14030fe0a21b60322c440ad2d20cf7685a376'
21 tip 1:b9154636be938d3d431e75a7c906504a079bfe07
21 tip 1:b9154636be938d3d431e75a7c906504a079bfe07
22 first 0:acb14030fe0a21b60322c440ad2d20cf7685a376
22 first 0:acb14030fe0a21b60322c440ad2d20cf7685a376
23 + hg identify
23 + hg identify
24 b9154636 tip
24 b9154636be93 tip
25 + echo bb
25 + echo bb
26 + hg status
26 + hg status
27 C a
27 C a
28 + hg identify
28 + hg identify
29 b9154636+ tip
29 b9154636be93+ tip
30 + hg co first
30 + hg co first
31 + hg id
31 + hg id
32 acb14030+ first
32 acb14030fe0a+ first
33 + hg -v id
33 + hg -v id
34 acb14030fe0a21b60322c440ad2d20cf7685a376+ first
34 acb14030fe0a21b60322c440ad2d20cf7685a376+ first
35 + hg status
35 + hg status
@@ -38,10 +38,10 b' C a'
38 + hg add b
38 + hg add b
39 + hg commit -t branch -u test -d '0 0'
39 + hg commit -t branch -u test -d '0 0'
40 + hg id
40 + hg id
41 c8edf041 tip
41 c8edf04160c7 tip
42 + hg co -m 1
42 + hg co -m 1
43 + hg id
43 + hg id
44 c8edf041+b9154636+ tip
44 c8edf04160c7+b9154636be93+ tip
45 + hg status
45 + hg status
46 C a
46 C a
47 C .hgtags
47 C .hgtags
Show file before | Show file after | Hide comments
@@ -28,16 +28,16 b''
28 C a
28 C a
29 + hg -d up
29 + hg -d up
30 resolving manifests
30 resolving manifests
31 ancestor a0c8bcbb local a0c8bcbb remote 1165e8bd
31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
32 a versions differ, resolve
32 a versions differ, resolve
33 remote created b
33 remote created b
34 getting b
34 getting b
35 merging a
35 merging a
36 resolving a
36 resolving a
37 file a: other d730145a ancestor b789fdd9
37 file a: other d730145abbf9 ancestor b789fdd96dc2
38 + hg -d up -m
38 + hg -d up -m
39 resolving manifests
39 resolving manifests
40 ancestor 1165e8bd local 1165e8bd remote 1165e8bd
40 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
41 + hg parents
41 + hg parents
42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
43 user: test
43 user: test
General Comments 0
You need to be logged in to leave comments. Login now