File APIs for Java Developers
Manipulate DOC, XLS, PPT, PDF and many others from your application.
The moose likes Other Open Source Projects and the fly likes SVN Merging Branches Big Moose Saloon
  Search | Java FAQ | Recent Topics | Flagged Topics | Hot Topics | Zero Replies
Register / Login
JavaRanch » Java Forums » Products » Other Open Source Projects
Bookmark "SVN Merging Branches" Watch "SVN Merging Branches" New topic

SVN Merging Branches

Sean Keane
Ranch Hand

Joined: Nov 03, 2010
Posts: 582

Hi guys,

I have just started to use Subversion and I am having some difficulty with merging. Would anyone be able to help?

I am attempting to create a merge conflict but one is not occurring where I expect it to. My test case is based on the following set up:

1. Create repository with the following structure

- HelloWorldProject\trunk\HelloWorldProject
- HelloWorldProject\branches

2. Add to the trunk:

3. Create branch from the HEAD of the trunk called BRANCH_01

My repository structure is now as follows:
- HelloWorldProject\trunk\HelloWorldProject
- HelloWorldProject\branches\BRANCH_01\HelloWorldProject

4. Modify on the branch

5. Modify on the trunk to create a conflicting change

6. Merge the branch into the trunk

Now I expect these two lines to conflict

TRUNK: System.out.println("Hello World v1.0 - change from trunk for merge conflict");
BRANCH: System.out.println("Hello World v1.0 - change from BRANCH_01 for merge conflict");

But here is what I get on the TRUNK:

When I run a diff, here is what I get:

For all these operations I am using TortoiseSVN.

Any ideas of why I am not seeing a merge conflict? Cheers, Sean.

SCJP (1.4 | 5.0), OCJP (6.0), OCMJD
I agree. Here's the link:
subject: SVN Merging Branches
It's not a secret anymore!