Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rename-merge1.out @ 5331:8ee5b8129e7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: don't raise an exception when displying empty repos The nullid node claims it's in the default branch, but the branch dict is empty. This fixes the main symptom from issue696, but we may want to set branchtags()['default'] = nullid somewhere for empty repos.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 24 Sep 2007 19:00:11 -0300
parents f191bc3916f7
children 17ed9b9a0d03
line wrap: on
line source

checkout
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
merge
resolving manifests
 overwrite None partial False
 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
 a2: divergent renames -> dr
 a: remote moved to b -> m
 b2: remote created -> g
copying a to b
merging a and b
my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
removing a
warning: detected divergent renames of a2 to:
 c2
 b2
getting b2
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M b
  a
M b2
R a
C c2
blahblah
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0      67      0       1 dc51707dfc98 000000000000 000000000000
     1        67      72      1       3 b2494a44f0a9 000000000000 dc51707dfc98
b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66