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

Re: svn multi-folder merge conflict

From: Stefan Hett <stefan_at_egosoft.com>
Date: Tue, 26 Jul 2016 11:19:59 +0200

On 7/26/2016 5:24 AM, Bhaskar Jebamani wrote:
> HI ,
> I'm new to SVN branching and merging. I have created SVN folder
> structure as (ref image).
>
> 1. T1 and T2 develop code and commit to their respective folder
> 2. From each team folder, code has to be merge to common folder
> Development > trunk
> 3. T1 merged to Development > trunk.
> 4. T2 updates their folder by merging from Development> trunk.
> 5. On merging, T2 facing files conflict.
>
> on trying to resolve/edit conflict, diff is not showing the
> Development conflict code in left panel and right panel has T2
> conflict code.
>
> Is the folder structure, right? I am missing any merge setting between
> folders???
>
That really depends on your particular needs/requirements/flavor.
Personally I would have gone with a slightly different approach here:
- trunk
- branches
    -Teams
       - T1
       - T2
- tags

Development/trunk goes into trunk
Production/trunk will become tags/Version for a released version (copy
from trunk)
Teams/T1/trunk goes into branches/Teams/T1

Teams sync their branches by merging changes from trunk and merge their
changes back to development by integrating them into trunk.

If you are releasing a let's say version 1.0 of the product and
development continues towards 2.0 you could create a 1.x. If you want at
that point to also split up the team branches into separate 1.x and 2.x
branches, then you could also branch of branches/Teams to
branches/Teams_1.x and teams would continue work on branches/Team and
switch to the 1.x Teams branch to do 1.x related work.

Relying on the trunk/branches/tags structure has the main advantage that
normally other tools better integrate into SVN, if you somehow preserve
this structure. Technically your approach would function too, though
(but might get a bit messy/complicates at the point you want to branch
of versions).

> After changing merge setting I am able to see the expected files in
> the diff panel, but the diff includes the lines that have been deleted
> long back. (ref img)
>
See:
https://tortoisesvn.net/docs/release/TortoiseMerge_en/help-onepage.html#tmerge-dug-view-merge
Personally I also have a hard time fully getting the tortoise merge
display sometimes. So unless I'm mistaken the yellow lines mean that
these sections have been removed. The == marker at the left indicates
that this line was identified to be the same as the most line in the
merge's common ancestor (again the background color indicates it was
removed in the merge --- see the merged window which indicates the -
symbol to the left of these lines indicating all were removed).

-- 
Regards,
Stefan Hett, Developer/Administrator
EGOSOFT GmbH, Heidestrasse 4, 52146 Würselen, Germany
Tel: +49 2405 4239970, www.egosoft.com
Geschäftsführer: Bernd Lehahn, Handelsregister Aachen HRB 13473
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3180213
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-07-26 11:20:11 CEST

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