From: Egon W. <ego...@gm...> - 2009-01-30 13:10:27
|
Hi all, when I branched CDK 1.2.x from Trunk, I made stupid git mistake when keeping them synchronized... 1 we should have not backport patches 2 I should have used 'git rebase' not 'git merge' I tried getting trunk up to date... but hit some more trouble with patch merging in the plane, because some patches were manually applied earlier... it's not that git is not good at merging, but really that trunk got messed up... Checking the 400+ patches that still need moving from cdk1.2.x to trunk, I suggest to throw away trunk (aka move to a branch trunk-messed-up), branch from cdk1.2.x a new trunk and apply to 50-ish patches made to the new trunk available from trunk-messed-up but not from cdk1.2.x... If no one objects before Sat morning CET, I'll proceed... Egon -- ---- http://chem-bla-ics.blogspot.com/ |
From: Rajarshi G. <rg...@in...> - 2009-01-30 13:18:19
|
On Jan 30, 2009, at 6:30 AM, Egon Willighagen wrote: > Hi all, > > when I branched CDK 1.2.x from Trunk, I made stupid git mistake when > keeping them synchronized... > > 1 we should have not backport patches > 2 I should have used 'git rebase' not 'git merge' > > I tried getting trunk up to date... but hit some more trouble with > patch merging in the plane, because some patches were manually applied > earlier... it's not that git is not good at merging, but really that > trunk got messed up... > > Checking the 400+ patches that still need moving from cdk1.2.x to > trunk, I suggest to throw away trunk (aka move to a branch > trunk-messed-up), branch from cdk1.2.x a new trunk and apply to 50-ish > patches made to the new trunk available from trunk-messed-up but not > from cdk1.2.x... Sounds complex - this will ensure that some of the commits to current trunk will be retained in the new trunk right? Eg revs 12561 and 12508 ------------------------------------------------------------------- Rajarshi Guha <rg...@in...> GPG Fingerprint: D070 5427 CC5B 7938 929C DD13 66A1 922C 51E7 9E84 ------------------------------------------------------------------- Q: What's purple and commutes? A: An abelian grape. |
From: Egon W. <ego...@gm...> - 2009-01-30 13:20:51
|
On Fri, Jan 30, 2009 at 2:18 PM, Rajarshi Guha <rg...@in...> wrote: > On Jan 30, 2009, at 6:30 AM, Egon Willighagen wrote: > Sounds complex - this will ensure that some of the commits to current > trunk will be retained in the new trunk right? Eg revs 12561 and 12508 Yeah, I went through the commits of trunk, and there were not overly much... some of which applied to Nightly was has since move into a separate project... I'll make sure to double check including 12561 and 12508... Egon -- ---- http://chem-bla-ics.blogspot.com/ |
From: Christoph S. <ste...@eb...> - 2009-01-30 13:18:24
|
Egon, please go ahead and do as proposed. We all owe you a lot for this heroic task :-) Honestly. I guess once these things are sorted, we need a fresh discussion about moving to GIT completely. Cheers, Chris Egon Willighagen wrote: > Hi all, > > when I branched CDK 1.2.x from Trunk, I made stupid git mistake when > keeping them synchronized... > > 1 we should have not backport patches > 2 I should have used 'git rebase' not 'git merge' > > I tried getting trunk up to date... but hit some more trouble with > patch merging in the plane, because some patches were manually applied > earlier... it's not that git is not good at merging, but really that > trunk got messed up... > > Checking the 400+ patches that still need moving from cdk1.2.x to > trunk, I suggest to throw away trunk (aka move to a branch > trunk-messed-up), branch from cdk1.2.x a new trunk and apply to 50-ish > patches made to the new trunk available from trunk-messed-up but not > from cdk1.2.x... > > If no one objects before Sat morning CET, I'll proceed... > > Egon > > > -- Dr. Christoph Steinbeck Head of Chemoinformatics and Metabolism European Bioinformatics Institute (EBI) Wellcome Trust Genome Campus Hinxton, Cambridge CB10 1SD UK Phone +44 1223 49 2640 What is man but that lofty spirit - that sense of enterprise. ... Kirk, "I, Mudd," stardate 4513.3.. |