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

RE: Re: FeatureRequest: Improved svn:externals handling on Merge

From: Marcel Hesselbarth <hessi9_at_yahoo.de>
Date: Mon, 23 Jul 2012 02:26:48 -0700 (PDT)

In fact this is working well, if I do 2 separate merges. So the merge itself done by snv library works well, and I think it is a question of the client to trigger the second merge operation.

So one more example to explain it in detail:
I have the following svn structure:
  svn:external Propery: svn://svn/test/sub/trunc sub
  File: Mainfile.txt
svn://svn/test/sub/trunc Project
  File: Subfile.txt

Now I make a branch and set the svn:external Propery:
  svn:external Propery: svn://svn/test/sub/branch1 sub
  File: Mainfile.txt
svn://svn/test/sub/branch1 Project
  File: Subfile.txt

On a Checkout of main Project this will result in the following file structures:
  | Mainfile.txt
  | sub
  | | Subfile.txt
  | Mainfile.txt
  | sub
  | | Subfile.txt

If I make changes at Mainfile.txt and Subfile.txt at main in one commit with version 123. To merge these changes to the branch I have to do the following:
1. Go to mainBranch folder an merge svn://svn/test/main/trunc version 123
2. Go to mainBranch/sub folder and merge svn://svn/test/sub/trunc version 123
All information required for the 2. merge of the externals folder is already known by the tortoise client. It knows there are files at the svn://svn/test/sub/trunc folder included at these commit and it knows these files are loyally stored at mainBranch/sub.

And you are right the second merge can be done either by the tortoise client or the svn library. As the commit of externals is not recommended by snv and is helpfully done by the tortoise client I think the feature of merging of these external commits belongs to area of the tortoise client as well.

With kind regards,
  Marcel Hesselbarth


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-07-23 11:26:56 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.