Hi Sebastian, In order to apply a single commit on the master branch, you simply cherry-pick it locally (in Eclipse: switch to master, right-click on the commit in the release branch, choose "cherry-pick"). Then you simply push this "new" commit to Gerrit.
When we merge back the release branch into the master branch at the end of the week, this commit will be already part of the master, and Git will maybe recognize this, but probably it will not because the ID is a different one. Then the merging process will require more manual work, but I think even that would be feasible. If we want a clearer history, some rebasing will be required [1], but in general that's not a good idea on "public" branches. Franz Links: [1] http://davitenio.wordpress.com/2008/09/27/git-merge-after-git-cherry-pick-avoiding-duplicate-commits/ -----Original Message----- From: sta...@zedat.fu-berlin.de [mailto:sta...@zedat.fu-berlin.de] Sent: Wednesday, August 29, 2012 10:43 AM To: dpp-devel@lists.sourceforge.net Subject: [Dpp-devel] Submit patch to master and release branch Dear developers, please look at http://saros-build.imp.fu-berlin.de/gerrit/#/c/224/. This fixes some failing STF tests which were introduced by http://saros-build.imp.fu-berlin.de/gerrit/#/c/187/. I already submitted this patch to the release branch after it was successfully reviewed. Is it possible to merge this patch into the master branch right now? Because the STF tests will continue failing on the master branch. What would be the best way to accomplish this? Best regards, Sebastian ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Dpp-devel mailing list Dpp-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dpp-devel ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Dpp-devel mailing list Dpp-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dpp-devel
