Mercurial > hg
view tests/test-rename-merge1.out @ 3839:3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
- Use koi8-r instead of euc-jp, as the later isn't available in python2.3.
- Add unicode representation for latin1 e', too.
- Use date "1000000 0" like in other tests (though not strictly needed
because we no longer use %c as default datestr format).
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 09 Dec 2006 11:16:27 +0100 |
parents | 0fb66912040a |
children | 723e0ddb6ada |
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 a: remote moved to b -> m b2: remote created -> g merging a and b my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c copying a to b removing a 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