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

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

> 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?

> Thanks.

I've been wondering the same. Maybe TSVN could offer an option to
copy(/paste) revision ranges' log messages, so at least those are saved.

r413: log message
r414: log message
...

That's always assuming there isnt already a better way/practice.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Feb 21 09:19:07 2006