0

I have a SVN repository where I have the following structure:

 +-trunk
 |   |
 |   +-dir1
 |   |
 |   +-dir2
 | 
 +-branches
 |
 +-tags

I'm trying to make some significant changes in dir1, so I created a new branch for it, since dir2 is quite heavy and it would take a long time to check it out for every new branch I create. So I did this:

$ svn copy http://server/svn/project/trunk/dir1 http://server/svn/project/branches/branch1 -m "creating a new branch"
$ svn co http://server/svn/project/branches/branch1

No problems so far. The problem comes up whenever I try to merge the trunk int the new branch again.

$ cd branch1
$ svn merge http://server/svn/project/trunk/dir1

When I do this, I get something like this:

C file1
C file2
[many C lines here]

Summary of conflicts:
  Tree conflicts: 114

An important detail is that I'm trying to merge immediately after creating and checking out the branch, so there's no change to the branch or the trunk.

So, what am I doing wrong here? Why am I receiving all those tree conflicts?

Thanks in advance!

Tyler
  • 21,762
  • 11
  • 61
  • 90
Felipe Sodre Silva
  • 211
  • 4
  • 13
  • It would help if you could update your question and add more information about the merge conflicts. Open `file1` and check what svn has indicated as merge conflicts. (for example removal or duplicating the content) – Veger Aug 09 '11 at 23:37
  • Branching part of a repository is going to confusing for others on your team particularly new team members. It sounds like you want dir1 and dir2 to be their own repositories - you're already managing them that way. – thekbb Mar 11 '13 at 22:30

2 Answers2

1

I ended up finding the problem.

My SVN server is < 1.5, and branch merging information is stored in the server only from 1.5.

Therefore, when I did a merge, instead of merging from the revision that the merge was created, it was merging all revisions beggining at 1, and because of that there were so many tree conflicts.

Felipe Sodre Silva
  • 211
  • 4
  • 13
0

We briefly discuss how to handle merges when your repository doesn't support mergetracking in the 'Version Control with Subversion' book. See the 'Keeping a Branch in Sync Without Merge Tracking' sidebar in this section of the book (http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.branchemerge.basicmerging.stayinsync)

pburba
  • 106
  • 3