I don't have a 9.04 machine or one that I could change to that at the moment...
John On 24 Jun 2009 at 9:20, Jeff Epler wrote: > On Wed, Jun 24, 2009 at 07:08:48AM -0600, John Thornton wrote: > > I like the branch idea, unless the change can be tested. > > > > If you created a 2.3 9.04 branch does it get updated automagiclly > with > > other 2.3 changes or would someone have to monitor that? I'm not > > exactly sure how everything works in git but I like it. > > Whoever is taking care of this branch would have to actively > choose changes from trunk (probably using cherry-pick) and > incorporate > bugfixes from v2_3_branch (probably using merge). > > Creating the branch: > $ git branch --no-track v2_3_ports_branch origin/v2_3_branch > $ git checkout v2_3_ports_branch > Switched to branch "v2_3_ports_branch" > > Merging changes from v2_3_branch: > $ git merge v2_3_branch > Updating db12e77..e3f44a2 > Fast forward > src/emc/usr_intf/axis/scripts/axis.py | 116 > +++++++++++++++++++-------------- > 1 files changed, 68 insertions(+), 48 deletions(-) > > Cherry-picking a change: > $ git cherry-pick eeb716 > Finished one cherry-pick. > [v2_3_ports_branch 071095b] Directly use X font metrics because > Tk8.5 "font measure" doesn't > 3 files changed, 38 insertions(+), 5 deletions(-) > > I don't (yet, anyway) have a 9.04 system so I'm looking to somebody > else > to actually maintain this proposed branch. > > Jeff > > -------------------------------------------------------------------- > ---------- > _______________________________________________ > Emc-developers mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/emc-developers ------------------------------------------------------------------------------ _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
