Tilmann Singer <tils@tils.net>


r863126 | dlr | 2007-01-16 23:37:56 +0000 (Tue, 16 Jan 2007)

Make multiple invocations of 'svn merge' from an invocation of
'svnmerge.py merge' behave like the combined merge in cases where an
'svn merge' produces a local modifications which interfere with a
subsequent 'svn merge'.

As svnmerge.py runs only in clean working copies, the only possible
local modifications are those produed by svnmerge.py itself: here we
*REALLY* want --force.  See the following message and surrounding
email thread:

Date: Thu, 11 Jan 2007 00:03:17 +0100
From: Giovanni Bajo <rasky@develer.com>
Subject: Re: [Svnmerge] Bugs when merging revisions that modify and deletefiles
Message-ID: <45A570B5.1040100@develer.com>

* contrib/client-side/svnmerge.py
  (action_merge, action_rollback): Add the --force to invocation of
   the Subversion command-line binary's 'merge' command.

Patch by: Tilmann Singer <tils@tils.net>
(Tweaked by me.)
Reviewed by: giovannibajo