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

Re: SVN branch / merge best practice question

From: Alexey <a.n.vinogradov_at_gmail.com>
Date: Tue, 17 Jun 2008 09:58:05 -0700 (PDT)

Why not? If you suggest to just rename the brunch - then the log will
also be valid - since there were no copying at all. It was the history
of the branch - i.e. "when it was called /branches/YYY, many things
happens. And then it was renamed and became /trunk".

I.e., this is actually no way to copy the log history. But on simple
renaming no copy at all is made.

On 17 , 22:32, "Konstantin Kolinko" <knst.koli..._at_gmail.com> wrote:
> In such simple case my recipe would be not to bother with merging,
> but just to rename /trunk to /branches/oldversion and rename or copy
> the new branch as /trunk.
>
> > will I also transfer the log of commits (..)?
>
> No, you won't. Merging just transfers your changes to your working copy,
> and then you do a single commit. The "show log" will display only this
> single commit.
> I do not know whether 1.5.x with its new support of merges will show more
> information in this case, but 1.4 will not.
>
> Best regards,
> Konstantin Kolinko
>
> 2008/6/17 Lars P. <larspontoppi..._at_gmail.com>:
>
>
>
> > 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-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org

---------------------------------------------------------------------
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 19:01:44 CEST

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