Mercurial > hg
view tests/test-rename-merge1.out @ 9485:7d6ac5d7917c
test-gendoc: add tests for all languages
This ensures that we catch errors in the reST syntax early and for all
languages. The only change needed in gendoc.py was to correct the
computation of section underlines for Asian languages.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 27 Sep 2009 10:12:02 +0200 |
parents | af5f099d932b |
children | ba5e508b5e92 |
line wrap: on
line source
checkout 2 files updated, 0 files merged, 2 files removed, 0 files unresolved created new head merge searching for copies back to rev 1 unmatched files in local: c2 unmatched files in other: b b2 all copies found (* = to merge, ! = divergent): c2 -> a2 ! b -> a * b2 -> a2 ! checking for directory renames a2: divergent renames -> dr resolving manifests overwrite None partial False ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 a: remote moved to b -> m b2: remote created -> g preserving a for resolve of b removing a picked tool 'internal:merge' for b (binary False symlink False) merging a and b to b my b@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c premerge successful 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