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

How to keep the history of a file when bringing changes from branch to trunk?

From: Kevin Hung <cykhung_at_gmail.com>
Date: 2006-02-18 02:19:43 CET

I am learning TSVN and come across this question (this is more like a svn

After I am done with a branch, I would like to bring all the changes (made
in the branch) back to the trunk. So I use "svn merge". This operation
compares the 2 revisions of the branch and puts the results of the merge
into my trunk working copy. Assume that there is no conflict. Then the next
step is to commit all the changes in my trunk working copy to the
repository. So I type in some comment to avoid the application of the same
merging in the future.

Now the problem with the above procedure is that all the history (eg. commit
log messages) that I made in the branch are not transferred to the trunk.
Basically I lost all the history of my developement. What is the normal
practice? Do people want to keep all the history ever made in the branch? Or
people just want to throw out all the history made in the branch? I tend to
like to keep all history so that even when I checkout the file from the
trunk, I can still see all the development history (including those history
made in a branch).

So is there a way to bring all history made in a branch back to the trunk?

Received on Sat Feb 18 02:19:57 2006

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.