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

Re: TortoiseSVN Merge Behavior with svn:externals

From: Ryan Phillips <ryan_at_largerinfinity.com>
Date: Thu, 14 Aug 2008 12:22:32 -0500

On Thu, Aug 14, 2008 at 12:09 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> Ryan Phillips wrote:
>>
>> Hi All,
>>
>> It took me awhile, but I was able to switch my employer over to
>> subversion. We are mostly a Linux shop, but I have ran into a slight
>> discrepancy.
>>
>> The command line svn tool doesn't recurse into svn:externals on an svn
>> merge. Everything is running SVN 1.5 and TortoiseSVN 1.5. We have the
>> typical repository layout with a trunk/ and branches/feature_1 folder.
>> When syncing the branch on Linux with svn merge everything works fine.
>> The externals directory modifications are _not_ part of the commit.
>> However, if a developer does a TortoiseSVN merge from the trunk to the
>> feature branch then modifications within the externals are picked up
>> into the merge commit.
>>
>> According to the documentation for TortoiseSVN recursing into the
>> subdirectories is expected; however, the SVN red-bean book says that
>> the svn tools do not recurse except for 4 commands (checkout, status,
>> update, and one more). I've been using the cli for a long time. Is
>> committing a "merge" with Tortoise ok with svn:external modifications?
>> and does the merge tracking still work?
>
> Are you sure that the *merge* also included the externals? I seriously doubt
> that, because as you said Subversion does not do that, and TSVN uses the
> Subversion library to do the merge.
> Please check again, maybe some other operation made modifications to the
> externals.

Hi Stefan,

Thanks for replying.

I believe I was a little unclear. The TortoiseSVN merge did not bring
in merges into the external. The external had local working copy
modifications. After the merge, and upon the commit of the merge the
external was included within the commit set, since TortoiseSVN
defaults to including all externals in a commit. One has to unselect
the files in the external manually from what I can tell.

-Ryan

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-14 19:22:38 CEST

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