Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 337506 - Merge release branches before 0.6
Summary: Merge release branches before 0.6
Status: RESOLVED FIXED
Alias: None
Product: Linux Tools
Classification: Tools
Component: Project (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: 0.8.0   Edit
Assignee: Linux Distros Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-02-17 19:33 EST by Andrew Overholt CLA
Modified: 2011-06-02 18:34 EDT (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Andrew Overholt CLA 2011-02-17 19:33:05 EST
We've used http://search.cpan.org/~book/Git-FastExport-0.04/script/git-stitch-repo to join our various SVN repositories and ended up with git branches for each sub-repository's release branch.  It would be nice to join these.  It may be easier to create a merged branch from the release tags but the end result should be the same.

Starting with 0.7 and working our way backwards will be prudent as the earlier releases are less likely to have maintenance releases at this point.
Comment 1 Andrew Overholt CLA 2011-02-22 14:21:12 EST
I've merged the 0.7 release branch in my test repository:

  https://github.com/overholt/org.eclipse.linuxtools

I'll work backwards from 0.6 as time goes by but earlier versions get decreasingly important so they're not time-sensitive.  As such, I'm not going to have this block our move to git.

FWIW, the procedure I used for stable-0.7 was to git merge each R0_7_0 tag and branch but I may move to git cherry-pick for 0.6 and others as it looks like it may be easier.
Comment 2 Alexander Kurtakov CLA 2011-03-28 12:21:15 EDT
Should we close this bug now that we moved to git entirely?
Comment 3 Andrew Overholt CLA 2011-03-28 13:40:35 EDT
I've merged the 0.7, 0.6, and 0.5 branches.  I was thinking of keeping this open in case someone cares about <= 0.4 but I guess we can allow bugs to be opened in that case.