Author: philip
Date: Mon Dec 10 11:26:13 2012
New Revision: 1419347
URL: http://svn.apache.org/viewvc?rev=1419347&view=rev
Log:
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.
Modified:
subversion/branches/1.7.x-r1407131/ (props changed)
subversion/branches/1.7.x-r1407131/subversion/libsvn_wc/update_editor.c
subversion/branches/1.7.x-r1407131/subversion/tests/cmdline/svntest/
(props changed)
subversion/branches/1.7.x-r1407131/subversion/tests/cmdline/svntest/sandbox.py
Propchange: subversion/branches/1.7.x-r1407131/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1295418
Modified:
subversion/branches/1.7.x-r1407131/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1407131/subversion/libsvn_wc/update_editor.c?rev=1419347&r1=1419346&r2=1419347&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1407131/subversion/libsvn_wc/update_editor.c
(original)
+++ subversion/branches/1.7.x-r1407131/subversion/libsvn_wc/update_editor.c Mon
Dec 10 11:26:13 2012
@@ -3584,7 +3584,7 @@ change_file_prop(void *file_baton,
SVN_ERR(check_tree_conflict(&tree_conflict, eb, fb->local_abspath,
svn_wc__db_status_added,
svn_wc__db_kind_file, TRUE,
- svn_wc_conflict_action_add,
+ svn_wc_conflict_action_edit,
svn_node_file, fb->new_relpath,
scratch_pool, scratch_pool));
SVN_ERR_ASSERT(tree_conflict != NULL);
Propchange: subversion/branches/1.7.x-r1407131/subversion/tests/cmdline/svntest/
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/tests/cmdline/svntest:r1295418
Modified:
subversion/branches/1.7.x-r1407131/subversion/tests/cmdline/svntest/sandbox.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1407131/subversion/tests/cmdline/svntest/sandbox.py?rev=1419347&r1=1419346&r2=1419347&view=diff
==============================================================================
---
subversion/branches/1.7.x-r1407131/subversion/tests/cmdline/svntest/sandbox.py
(original)
+++
subversion/branches/1.7.x-r1407131/subversion/tests/cmdline/svntest/sandbox.py
Mon Dec 10 11:26:13 2012
@@ -291,6 +291,10 @@ class Sandbox:
self.repo_url + '/' + source,
self.repo_url + '/' + dest)
+ def simple_append(self, dest, contents, truncate=False):
+ """Append CONTENTS to file DEST, optionally truncating it first."""
+ open(self.ospath(dest), truncate and 'w' or 'a').write(contents)
+
def is_url(target):
return (target.startswith('^/')
