Merge produces 6(!) conflict files for one file
From: Marc Strapetz <marc.strapetz_at_syntevo.com>
Date: Tue, 01 Jul 2008 16:05:07 +0200
For the attached repository dump (received from one of our users), when
svn co svn://localhost/trunk trunk
And then merging:
svn merge svn://localhost/branches/dir/merge.txt trunk/merge.txt
Subversion 1.5.0 reports:
--- Merging r3 through r4 into 'trunk\merge.txt':
And results in 6 conflict files:
merge.txt.2.working
In case that this is no bug, can someone please explain how to
-- Thanks in advance, Marc Strapetz _____________ syntevo GmbH www.syntevo.com
---------------------------------------------------------------------
|
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.