| commit | d423d45654e273a7f958a7caac50fea78c652481 | [log] [tgz] |
|---|---|---|
| author | Philip Martin <philip@apache.org> | Mon Dec 10 11:26:13 2012 +0000 |
| committer | Philip Martin <philip@apache.org> | Mon Dec 10 11:26:13 2012 +0000 |
| tree | 0595874af56212770d8648bd386608d21abddc93 | |
| parent | 6fc8b9cce142e9d3a93414e50765387040a9fe71 [diff] |
On 1.7.x-r1407131 branch. Merge r1295418 to make the new test run, tweak the backport to make the new test PASS. * subversion/libsvn_wc/update_editor.c (change_file_prop): Change conflict action in check. * subversion/tests/cmdline/svntest/sandbox.py (simple_append): New. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1407131@1419347 13f79535-47bb-0310-9956-ffa450edef68