Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up test for update flags
authorMatt Mackall <mpm@selenic.com>
Sun, 10 Jul 2005 16:19:36 -0800
changeset 677 204328d345f1
parent 676 32f7dc81c07e
child 678 0cfc5966b2c2
Fix up test for update flags
tests/test-up-local-change.out file | annotate | diff | comparison | revisions 
--- a/tests/test-up-local-change.out	Sun Jul 10 16:17:05 2005 -0800
+++ b/tests/test-up-local-change.out	Sun Jul 10 16:19:36 2005 -0800
@@ -27,6 +27,7 @@
 C a
 + hg --debug up
 resolving manifests
+ force None allow None moddirstate True linear True
  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
 remote created b
@@ -36,6 +37,7 @@
 file a: other d730145abbf9 ancestor b789fdd96dc2
 + hg --debug up -m
 resolving manifests
+ force None allow 1 moddirstate True linear True
  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
 + hg parents
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
Mercurial