[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: Konstantin Kolinko <knst.kolinko_at_gmail.com>
Date: Wed, 18 Jun 2008 12:25:18 +0400

> how do I rename from .../branches/v3 to .../trunk ? It seems tortoise
> only provides for changing the folder name, and not going across
> levels in the path?

Use the Repository Browser, drag the folder with your right button
pressed, and a menu will appear. It includes "Copy and rename...",
"Move and rename..." commands.

2008/6/18 Lars P. <larspontoppidan_at_gmail.com>:
> Thanks for the answers, I think rename is the way to go for me. But
> how do I rename from .../branches/v3 to .../trunk ? It seems tortoise
> only provides for changing the folder name, and not going across
> levels in the path?
>
> On 17 Jun., 21:06, "Konstantin Kolinko" <knst.koli..._at_gmail.com>
> wrote:
>> Well, maybe I am not so correct, but it depends on the point of view:
>> what Lars wants to preserve. Which log events are more important: the
>> ones in the trunk (since the time the development branch was created),
>> or the ones in the branch.
>>
>> If you do a merge, you preserve the events in the trunk, but the merge
>> itself is a single commit.
>>
>> If you do renames (my recipe), the events of the trunk are lost, but
>> full history of the development branch is preserved.
>>
>> There is no simple way to preserve both. Well, if you want both
>> histories, you may walk through the development branch history and
>> merge changes from some successive pairs of revisions separately.
>> Maybe some scripting may simplify the task.
>>
>> Best regards,
>> Konstantin Kolinko
>>
>> 17 июня 2008 г. 20:58 пользователь Alexey <a.n.vinogra..._at_gmail.com> написал:
>>
>> > 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
>
> ---------------------------------------------------------------------
Received on 2008-06-18 10:25:38 CEST

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