What is going to be the main focus in 4.1? I recall that there was a discussion about authorization/authentication and layout API changes.
-- Arvīds 2012/8/16 Eric Dalquist <[email protected]> > Here are the step-by-step instructions for applying the changes made for > an issue on one branch to another branch: > https://wiki.jasig.org/display/UPC/Git+Workflow+for+Committers#GitWorkflowforCommitters-UpdatingPatchesBranches > > This uses the Cherry Pick feature in git which takes a commit or list of > commits and applies to diff for each to the current branch. All of the > commit information (message, author, commitor) is retained such that for > most cases it will be ~5 fairly boiler plate commands to get the commits > copied over and pushed out. > > Note that this isn't a "merge" in git parlance. If you try doing a git > merge of master into rel-4-0-patches or from your feature branch into > rel-4-0-patches things will go poorly. > > -Eric > > > On 08/14/2012 10:57 PM, Eric Dalquist wrote: > > master is now 4.1.0-SNAPSHOT and the rel-4-0-patches branch exists. I'll > add another page to the git workflow document on how to merge changes from > master back into 4-0-patches. > > -Eric > > > > On 8/12/12 11:17 PM, Eric Dalquist wrote: > > Once 4.0.6 is out (Monday) I'm going to move master to be 4.1 and create a > 4.0.6 branch. There are a few changes waiting on branches which are for 4.1 > and it is probably time to have a mainline for that work. I'll post a > reminder here once that branch is complete. > > -Eric > > > > > -- You are currently subscribed to [email protected] as: [email protected] To unsubscribe, change settings or access archives, see http://www.ja-sig.org/wiki/display/JSG/uportal-dev
