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

Re: Usage advice - personal branches

From: Tom Opgenorth <opgenorth_at_gmail.com>
Date: 2005-07-11 16:56:23 CEST

> This is fine, if you don't care about log history. Every time you
> branch a file and then merge it back, any log history on trunk version
> of file between branch and merge, will be lost. Thus, there will be
> changes made to the file, that won't be documented on the version of
> the file that sits at trunk head.
Just thinking outloud here. If one is interested in preserving the
log history between the personal branch and the main, could you not
just "merge" outside of SVN, from the personal branch to the trunk and
then commit the trunk?

For example: I make my personal branch and work in that for a while.
When I want to put my personal branch into the trunk, I use something
like Araxis Merge/WinMerge/KDiff three and merge my changes from my
personal branch to the trunk. Then I do a commit on the trunk.

Sounds kind of convoluted, but I guess it allows you to keep your log
history on the trunk, does it no?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 11 16:59:25 2005

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