Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-up-local-change.out @ 3122:2ef0b3aae186

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify actions with helper function
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 21:27:30 -0500
parents 1c1e59aac82a
children 3fd098e0902d
line wrap: on
line diff
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -17,8 +17,8 @@ summary:     1
 resolving manifests
  overwrite False branchmerge False partial False
  ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b
- a versions differ, resolve
-remote created b
+ a: versions differ -> m
+ b: remote created -> g
 merging a
 resolving a
 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
@@ -33,7 +33,7 @@ summary:     2
 resolving manifests
  overwrite False branchmerge False partial False
  ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b
-remote deleted b, clobbering
+ b: remote deleted -> r
 removing b
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 changeset:   0:33aaa84a386b
@@ -51,8 +51,8 @@ summary:     1
 resolving manifests
  overwrite False branchmerge False partial False
  ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b
- a versions differ, resolve
-remote created b
+ a: versions differ -> m
+ b: remote created -> g
 merging a
 resolving a
 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
@@ -102,8 +102,8 @@ failed
 resolving manifests
  overwrite False branchmerge True partial False
  ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b
- a versions differ, resolve
- b versions differ, resolve
+ a: versions differ -> m
+ b: versions differ -> m
 merging a
 resolving a
 file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2