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

Advice needed for re-factoring of repo

From: Joakim Schramm <joakim_at_astrocalc.com>
Date: Fri, 6 May 2011 13:52:59 -0700 (PDT)

I have a repo containing several projects, each organized as trunk, branches and tags. In 2 of the projects I realize I have gone too far in trunk after latest release, working on some stuff that would have fitted better to be branched and later reintegrated. I have done some searching in list so got some idea about how to proceed but not quite sure about the order of doing thing and if it even matters.

I will just bring up the tricky project here as the other is simpler and I should be able to figure it out from getting this right.

So what I want to do, in plain English, is set HEAD of trunk back lets say from r1250 to r1111 (last release), but I don't want to trash r1112 to r1250 but actually split it in 2 branches that can be kept in sync with further development of trunk and later reintegrated separately, each focusing on different things. So now is the question how to best do this re-factoring?

I understand that the basic approach should be something like:

1. Copy trunk to a new branch, but as I want 2 branches out of this, would I better do...
1a. make 2 branch copies from trunk, and then clean up code in each, or...
1b. make 1 branch from trunk and from that branch make 2 new branches by cherry picking revs? Or this will possibly causing problems to merge it back into trunk later? also, can first branch safely be deleted after the split?

2. Open log for project trunk and select the range of revs (r1112-r1250) I branched and choose "revert these revisions", but then...

I have externals, files only in trunk root, so I guess I have to checkout new stripped trunk, but exclude externals and re-add them set to a proper rev (they all comes from a "shared" project in repo). Then commit?

I think I have figured it out somewhat, but among other things I am unsure about the order to commit things, and of course which approach that is best to follow for the branches.

This post by Stefan gave some insight of te way to go: http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2409876&orderBy=createDate&orderType=desc

Thanks for help,



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-06 22:54:09 CEST

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