You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Marc Strapetz <ma...@syntevo.com> on 2008/07/01 14:05:07 UTC
Merge produces 6(!) conflict files for one file
For the attached repository dump (received from one of our users), when
checking out trunk:
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':
C trunk\merge.txt
--- Merging r5 through r9 into 'trunk\merge.txt':
CG trunk\merge.txt
And results in 6 conflict files:
merge.txt.2.working
merge.txt.merge-left.r2
merge.txt.merge-left.r4
merge.txt.merge-right.r4
merge.txt.merge-right.r9
merge.txt.working
In case that this is no bug, can someone please explain how to
interpret/handle this result?
--
Thanks in advance,
Marc Strapetz
_____________
syntevo GmbH
www.syntevo.com