On Thu, Jan 20, 2011 at 2:32 PM, Michael O'Cleirigh < [email protected]> wrote:
> There is a problem with my subtree merge method in that it doesn't check > dates, etc so it can clobber any 1.5 changes in master. I found this out > with my test case of jasperreports-parent which had the 1.5 changes present > (but the jdk-1.5-parent/pom.xml was missing the module entry) but the merge > reverted key files back to their wicket 1.4 state. > > While the merge will work, you need to make sure that there are changes in > core-1.4.x that are newer than what is in master. > > e.g. > > git log --diff-filter=AM --name-only master -- > jdk-1.5-parent/jasperreports-parent > git log --diff-filter=AM --name-only core-1.4.x -- > jdk-1.5-parent/jasperreports-parent > > This shows all adds and modifies on master and then core-1.4.xwith a path > of jdk-1.5-parent/jasperreports-parent. Look for the most recent commit > with changes to non pom.xml project files for each branch and then decide if > the merge would make sense. > > Its also possible to try out the change and if it is wrong then use `git > revert SHA1-of-merge-commit` to create a commit that reverts the changes. > > Mike > > I'm not git master (yet) but isn't it possible to use cherry-pick to pull the commits from 1.4.x ? cherry pick is like 'svn merge -c' and looks a lot easier to use to me. > > > >> When we split master from the core-1.4.x branch we kept all of the >> original and working in 1.4.x projects and then adjusted the master/pom.xml >> to remove any projects that wouldn't compile with 1.5. >> >> Now that wicket 1.5-RC1 will be released soon we should work on getting as >> many of the non working projects in master working. Even if most are >> missing from the 1.5-RC1 I can do accelerated point releases as more are >> added. >> >> For some projects it could be as simple as adding them into the pom.xml >> and then working through the 1.5 migration changes directly on the present >> code. >> >> But for some projects the version in the core-1.4.x branch has been >> updated since the core-1.4.x branch was created (the master branch code is >> out of date). >> >> I've found a way in git to use the subtree merge that will allow the >> core-1.4.x/project files to be merged onto the master/project files, see: >> https://github.com/wicketstuff/core/wiki/Helpful-Git-Commands (scroll >> down to the last section) >> >> Steps: >> 1. Fork the https://github.com/wicketstuff/core repository >> 2. Follow the steps on the wiki page to backport the changes from a >> specific module. >> 3. Commit the merge (updating the pom.xml's back to 1.5-SNAPSHOT) >> 4. Add in additional commits as required to make the project compatible >> with wicket 1.5-SNAPSHOT (i.e. make it build) >> 5. Create a pull request onto master to let us pull in your changes. >> >> For the test I did with jdk-1.5-parent/jasperreports-parent I just >> committed directly into wicketstuff/core repository but I think using the >> pull functionality of github would be more verbose. >> >> Regards, >> >> Mike >> >> >
