[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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
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:


In case that this is no bug, can someone please explain how to
interpret/handle this result?

Thanks in advance,
Marc Strapetz
syntevo GmbH

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org

Received on 2008-07-01 16:05:38 CEST

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.