• Post Reply Bookmark Topic Watch Topic
  • New Topic
programming forums Java Mobile Certification Databases Caching Books Engineering Micro Controllers OS Languages Paradigms IDEs Build Tools Frameworks Application Servers Open Source This Site Careers Other Pie Elite all forums
this forum made possible by our volunteer staff, including ...
  • Campbell Ritchie
  • Jeanne Boyarsky
  • Ron McLeod
  • Paul Clapham
  • Liutauras Vilda
  • paul wheaton
  • Rob Spoor
  • Devaka Cooray
Saloon Keepers:
  • Stephan van Hulst
  • Tim Holloway
  • Carey Brown
  • Frits Walraven
  • Tim Moores
  • Mikalai Zaikin

SVN Merging Branches

Ranch Hand
Posts: 590
Eclipse IDE Chrome Java
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
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 HelloWorld.java 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 HelloWorld.java on the branch

5. Modify HelloWorld.java 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.
    Bookmark Topic Watch Topic
  • New Topic