Mercurial > hg

comparison tests/test-issue522.out @ 8753:af5f099d932b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: refactor manifestmerge init to better report effective ancestor
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents e7ed5d07cc4c
children ba5e508b5e92
comparison
equal deleted inserted replaced
8752:f177bdab261b 8753:af5f099d932b
1 reverting foo 1 reverting foo
2 changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e 2 changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 searching for copies back to rev 1
5 unmatched files in local:
6 bar
4 resolving manifests 7 resolving manifests
5 overwrite None partial False 8 overwrite None partial False
6 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee 9 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
7 searching for copies back to rev 1
8 unmatched files in local:
9 bar
10 foo: remote is newer -> g 10 foo: remote is newer -> g
11 getting foo 11 getting foo
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
13 (branch merge, don't forget to commit) 13 (branch merge, don't forget to commit)
14 n 0 -2 unset foo 14 n 0 -2 unset foo