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

SVN branch / merge best practice question

From: Lars P. <larspontoppidan_at_gmail.com>
Date: Tue, 17 Jun 2008 05:15:36 -0700 (PDT)

Hello!

I'm using TortoiseSVN for single user version control of software
development.

I have created a branch in a project and worked a lot on that branch
to the point where there software is almost a complete rewrite. Now
the branch is mature enough to use as the main version, and in
principle I would like to make some kind of switch such that the
current trunk becomes a branch (to keep the old version), and the
branch with the new version becomes the trunk.

How do I do that? I'm thinking that I should branch from the old trunk
first and then merge my new branch into trunk. But doing that, will I
also transfer the log of commits I did on the branch such that they
appear when I say "show log" in trunk?

Thanks,
Lars

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-17 14:47:37 CEST

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