On Fri, Apr 20, 2012 at 12:28, Jarkko Lempiainen <jarkko_at_profoundic.com> wrote:
> Hi,
>
> I have an SVN repository which has two branches, one which contains a copy of the "official" version of the code base, and another which has "local" modified version of that code base. The real "official" version is in completely different repository (may not even be SVN), so once in awhile I sync to that repository and copy the real "official" version to my copy of the "official" version in SVN. Then I can merge changes from my copy of the "official" version to the "local" modified version using SVN merge.
>
> However, this is a problem, because when I copy the real "official" version to my copy of the "official" version (i.e. just copy the dir hierarchy in Windows Explorer), it doesn't of course add/remove the files that were added/removed in the real "official" version to the changelist (just lists the modified files). Is there some kind of SVN script for this kind of dir hierarchy copy which also adds/removes files to the changelist? Or is there some better way to do this?
You are describing what the Subversion Manual calls a "Vendor Branch."
See http://svnbook.red-bean.com/en/1.7/svn.advanced.vendorbr.html
svn_load_dirs.pl is usually what's recommended to address this.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2950253
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-04-20 19:31:42 CEST