Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-issue522.out @ 5371:17ed9b9a0d03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add debug diagnostics for findcopies
author Matt Mackall <mpm@selenic.com>
date Thu, 04 Oct 2007 19:44:37 -0500
parents 90d9ec0dc69d
children 8feb33c2d153
comparison
equal deleted inserted replaced
5370:61462e7d62ed 5371:17ed9b9a0d03
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 resolving manifests 4 resolving manifests
5 overwrite None partial False 5 overwrite None partial False
6 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee 6 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
7 searching for copies back to rev 1
8 unmatched files in local:
9 bar
7 foo: remote is newer -> g 10 foo: remote is newer -> g
8 getting foo 11 getting foo
9 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
10 (branch merge, don't forget to commit) 13 (branch merge, don't forget to commit)
11 n 0 -2 unset foo 14 n 0 -2 unset foo