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

Problems with svn merge on merging a whole branch to another

From: Thomas Mauch <thomas.mauch_at_gmx.net>
Date: 2005-06-11 15:00:29 CEST

I try exactly to do what is described as common-use for merging in the
Subversion book in the section "Merging a Whole Branch to Another", but I'm
encountering a lot of conflicts where I think the merge should be able to
process the files silently and correctly without user intervention.

Here's what I'm doing:

- I have a freshly updated version of the trunk in a directory named 'dvl'

> cd dvl
> svn update
At revision 542.

- I create the branch in revision 503, so now for mergin I do

> svn merge -r 503:HEAD svn://myserver/myrepos/mybranch

As the branch has not been existing very long and few development was done
on the same file in the trunk and the branch, I expected to get only status
'Updated' during the merge, but I get more 'Conflicts' than 'Updates' - even
on files which have not been modified in the trunk in the mean time!
If I look in such a file, I see only conflicts like the one below where
there is really nothing conflicting:

<<<<<<< .working
        // some lines
        // of code
        // are her
=======
>>>>>>> .merge-right.r542

Some files which have about the same changes applied, are ok.

What do you think can cause such a problem (I'm using Subversion 1.2)?
Any help appreciated

Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jun 11 15:02:49 2005

This is an archived mail posted to the Subversion Users mailing list.