Two-step merge ok, one-step merge conflicts
From: Timur Khanipov <khanipov_at_gmail.com>
Date: Wed, 19 Aug 2015 21:20:22 +0400
Hi folks.
I faced the following problem. The command
I reproduced it in a simple situation when trunk contains only a
r1. Initial directory structure (trunk and branches).
After that I checkout branches/test and try to perform the merge
I performed the test with the following Subversion version:
svn, version 1.9.0 (r1692801)
I attach the script (cmd batch file) which creates local repository
My guess is that svn:eol-style change is the root of the problem.
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.