##// END OF EJS Templates
Fix up test for update flags
Matt Mackall -
r677:204328d3 default
parent child Browse files
Show More
@@ -27,6 +27,7 b' diff -r c19d34741b0a a'
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
@@ -36,6 +37,7 b' 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
General Comments 0
You need to be logged in to leave comments. Login now