Mercurial > hg > pyhgsh

changeset 677:204328d345f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up test for update flags
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Jul 2005 16:19:36 -0800
parents 32f7dc81c07e
children 0cfc5966b2c2
files tests/test-up-local-change.out
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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