Thank you for your response! This may demonstrate my question more
clearly:
The script I posted creates an empty trunk and a branch from it, and
then creates dir/file.txt in both trunk and branch separately, and
then merges trunk to branch, resulting in this tree conflict:
% svn st
M .
> -Original Message-
> From: Pete Harlan [mailto:pchpubli...@gmail.com]
> Sent: vrijdag 13 maart 2015 23:18
> To: Bert Huijben
> Cc: subversion
> Subject: Re: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in
> subdirs
>
> Hi,
>
> I narrowed down the change to this commit, in
Hi,
I narrowed down the change to this commit, in version 1.8.0-dev:
r1441043 | rhuijben | 2013-01-31 08:20:25 -0800 (Thu, 31 Jan 2013) |
30 lines
Following up on r1440966, also handle file obstruction handling in the merge
When I tried to set svn:eol-style property for a bunch of unmodified
files I faced the following problem: some files got status 'M' and
other files got status 'MM' meaning both property and content change.
Initially I considered it to be a bug and posted at
http://tortoisesvn.tigris.org/ds/viewMess
Hi,
I've been checking on if it's somehow reasonable for us to consolidate
mergeinfos which have been built-up over the past 3-4 years in our
repository. After checking on several papers/scripts/posts on the net,
I've found this script which seemed to be a promising candidate at first:
https:
