Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-up-local-change.out @ 2822:30f59f4a327e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduce update helper functions: update, merge, clean, and revert
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 22:54:33 -0500
parents bb403d427974
children 49988d9f0758
line wrap: on
line diff
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -17,7 +17,7 @@ date:        Mon Jan 12 13:46:40 1970 +0
 summary:     1
 
 resolving manifests
- force None allow None moddirstate True linear True
+ force False allow False moddirstate True linear True
  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
 remote created b
@@ -33,7 +33,7 @@ date:        Mon Jan 12 13:46:40 1970 +0
 summary:     2
 
 resolving manifests
- force None allow None moddirstate True linear True
+ force False allow False moddirstate True linear True
  ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
 remote deleted b
 removing b
@@ -51,7 +51,7 @@ date:        Mon Jan 12 13:46:40 1970 +0
 summary:     1
 
 resolving manifests
- force None allow None moddirstate True linear True
+ force False allow False moddirstate True linear True
  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
 remote created b
@@ -99,7 +99,7 @@ date:        Mon Jan 12 13:46:40 1970 +0
 summary:     2
 
 resolving manifests
- force None allow None moddirstate True linear False
+ force False allow False moddirstate True linear False
  ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
  a versions differ, resolve
  b versions differ, resolve