Mercurial > hg
view tests/test-merge9 @ 6174:434139080ed4
Permit XML entities to be escaped in template output.
Useful for creating XML documents directly from Hg logging. Can also be used for
HTML. For use in content, will escape '&', '<', and for completeness '>'
(although it is not strictly necessary). For use in attributes, will also escape
' and ". Will also replace nonprinting (ASCII) control characters with spaces,
since these are illegal in XML.
author | Jesse Glick <jesse.glick@sun.com> |
---|---|
date | Mon, 28 Jan 2008 22:19:12 -0500 |
parents | dc5920ea12f8 |
children | 92ccccb55ba3 |
line wrap: on
line source
#!/bin/sh # test that we don't interrupt the merge session if # a file-level merge failed hg init repo cd repo echo foo > foo echo a > bar hg ci -Am 'add foo' -d '0 0' hg mv foo baz echo b >> bar echo quux > quux1 hg ci -Am 'mv foo baz' -d '0 0' hg up -qC 0 echo >> foo echo c >> bar echo quux > quux2 hg ci -Am 'change foo' -d '0 0' # test with the rename on the remote side HGMERGE=false hg merge # test with the rename on the local side hg up -C 1 HGMERGE=false hg merge true