From 89af3d6fa6069a75a680c0c05e88dba9be6828a8 Mon Sep 17 00:00:00 2001
From: Tony Duckles <tony@nynim.org>
Date: Wed, 14 Dec 2011 22:28:23 -0600
Subject: [PATCH] Better svn merge handling

---
 svn2svn.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/svn2svn.py b/svn2svn.py
index 3e88f85..743f3c6 100755
--- a/svn2svn.py
+++ b/svn2svn.py
@@ -439,6 +439,7 @@ def pull_svn_rev(log_entry, svn_url, target_url, svn_path, original_wc, keep_aut
             run_svn(["up", m])
             m_url = svn_url + "/" + m
             out = run_svn(["merge", "-c", str(svn_rev), "--non-recursive",
+                     "--non-interactive", "--accept=theirs-full",
                      m_url+"@"+str(svn_rev), m])
             # if conflicts, use the copy from original_wc
             if out and out.split()[0] == 'C':
-- 
2.43.0