Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-merge1.out @ 4566:9b3a818adae6
test-patchbomb: sed -e may not work with extended regexps
Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD)
may not support extended regexps (i.e. including \| branches),
or may need a special option to enable it (like -E instead of -e).
Expand the sed RE in tests/test-patchbomb to fix running this
test on FreeBSD and Solaris.
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Wed, 13 Jun 2007 15:02:09 +0300 |
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