issue?
Do I try something which is not supported by SVN?
Kind regards,
Pieter-Jan Busschaert
mkdir mergetest
cd mergetest
mkdir trunk
cd trunk
mkdir subdir
cd subdir
echo "line1 00" > test.txt
echo "" >> test.txt
echo "line2 02" >> test.txt
echo "
Hello,
Here is some more information:
>> Inside branch1/subfolder, we do a merge from trunk/subfolder.
>
> Do you mean trunk/project/subfolder here?
yes
> Anyway, branch1/subfolder does not have any mergeinfo,
> since the previous merge was done on branch1. So Subversion
> does not know that yo
help,
Pieter-Jan
On 3 November 2010 10:17, Johan Corveleyn wrote:
> On Tue, Nov 2, 2010 at 11:29 AM, Pieter-Jan Busschaert
> wrote:
>> Hello,
>>
>> Here is some more information:
>>
>>>> Inside branch1/subfolder, we do a merge from trunk/sub
Hello,
>> There are a few things still not clear to me:
>> 1) Before this svn update, svn stat -u shows nothing out-of-date, so
>> it's strange that an update makes any difference.
>
> Try "svn stat -v", and you'll see the different working revisions of
> the files and dirs in the working copy. It
>> $ svn up -r 5 --depth=empty branch/subdir
>> At revision 5. <== doesn't change anything
>
> Yes it does. It changes the working revision of branch/subdir from 3
> to 5. Since this update didn't bring in new explicit mergeinfo on
> branch/subdir, svn can now safely assume that the merge
