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

Copying branch into trunk

From: <knut.hunstad_at_vianova.no>
Date: Fri, 29 Feb 2008 14:39:06 +0100


I have trouble finding the right keywords to search for, but I'm guessing
this topic has been discussed before. Let's say I for some reason have a
branch I have developed on, tested and everything's fine. Now I want to
copy this into the trunk (or another branch). And I mean _copy_, not
_merge_. I don't care what has been the previous history of anything, I
want the function to achieve the following (not sure this is a complete
list, but the point should be clear):

1. Files/Folders existing in both trunk and branch should be updated to
the branch version as if I had edited them manually (to look like the
branch version) after the last checkout, and marked as updated (or
unchanged, if the versions where the same).
2. Files/Folders existing in trunk, but not in branch, should be deleted
as if I had right-clicked on them and choosen "TortoiseSVN", "Delete", and
marked as deleted.
3. Files/Folders existing in branch, but not in trunk, are added as if I
had copied them as unversioned files and added them to SVN manually, and
marked as added.
4. I should not get any "conflicts" or anything, since I know that my
branch is the "master".

I have been playing with options like "Ignore ancestry", "Use From", but
to no avail. Any hints on how to achieve this?

Best regards,

Knut Hunstad
Received on 2008-02-29 15:31:21 CET

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.