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

Re: Copying branch into trunk

From: khun <Knut.Hunstad_at_vianova.no>
Date: Fri, 29 Feb 2008 10:59:43 -0800 (PST)

Thanks for trying, but this was not quite what I had in mind, although
you are correct that this would bring the code to the correct version
in the trunk. I guess my comment about not caring about the previous
history was misleading. I _do_ want the history to be retained to some
extent, but let' say that the branch was performed at some revision. I
have now messed up both the trunk with several revisions and the
branch with more. After the asked for operation has been done, I want
the trunk to show the history of a file at this point to be the
difference between the previous HEAD of trunk and the HEAD of the
branch. It's OK to disregard the history that has happened to the file
in the branch (which isn't retained after a merge either).

That's what I wass trying to explain with points 1-4 in my question.

Sorry if this isn't much clearer, I don't quite have all the terms of
SVN in my head yet, maybe that's why I don't see how to do this :-)

Best regards,

Knut

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-02-29 20:20:27 CET

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