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

TortoiseSVN Merge Behavior with svn:externals

From: Ryan Phillips <ryan_at_largerinfinity.com>
Date: Wed, 13 Aug 2008 23:23:52 -0500

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?

Thanks,
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 06:24:00 CEST

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