Re: [platform-releng-dev] Tagging question

[Paul Webster <pwebster@xxxxxxxxxxxxxxxxxxx>]

See http://dev.eclipse.org/mhonarc/lists/platform-ui-dev/msg05053.html and http://wiki.eclipse.org/Platform-releng/Git_Workflows#Configuring_the_repo

You can set the default merge strategy for a branch (like master) by setting the property.

branch.master.rebase=true

Then a pull will cause a rebase of your local commits on top of the the commits from the public repo.

On Mon, Oct 24, 2011 at 5:48 PM, Ian Bull <irbull@xxxxxxxxxxxxxxxxx> wrote:

Thanks Tom.  I will rebase instead from now on. I imagine as we all try to push tags right before a build this will hit us again.

Cheers,

Ian

On Mon, Oct 24, 2011 at 2:45 PM, Thomas Watson <tjwatson@xxxxxxxxxx> wrote:

What you did is OK, but I would prefer committers did a rebase when this happens. I'm sure this is easy with eGit, but I use command line to do the following when I get an error pushing from being behind the upstream branch (assuming you are using master and master is checked out):

git fetch
git rebase origin/master

Now you can attempt your push again.

This will fetch all the latest from upstream for all branches. The rebase will replay your local commits on top of the most recent version of origin/master that you just fetched. This allows for a linear commit line in the master branch.

Tom



Ian Bull ---10/24/2011 04:30:03 PM---I went to Tag p2 for the IBuild contribution. I checkedout the latest maps project, ran the tagging script, committed my chang

From:	Ian Bull <irbull@xxxxxxxxxxxxxxxxx>
To:	"Eclipse platform release engineering list." <platform-releng-dev@xxxxxxxxxxx>,
Date:	10/24/2011 04:30 PM
Subject:	[platform-releng-dev] Tagging question

---

I went to Tag p2 for the IBuild contribution.  I checkedout the latest maps project, ran the tagging script, committed my changes and went to push them back. In the mean-time, someone else had committed new map files.  At this point I did a pull (looks like Equinox and SWT map files changed), and then did a push.

Now it appears we have 'merge node' in our maps repository.

Was this the right thing to do?  It looks like the SWT and Equinox contributions (as well as the p2) ones are there so we should be good to go.  

Cheers,
Ian

--
R. Ian Bull | EclipseSource Victoria | +1 250 477 7484

http://eclipsesource.com | http://twitter.com/eclipsesource_______________________________________________
platform-releng-dev mailing list
platform-releng-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/platform-releng-dev

_______________________________________________
platform-releng-dev mailing list
platform-releng-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/platform-releng-dev

--
R. Ian Bull | EclipseSource Victoria | +1 250 477 7484
http://eclipsesource.com | http://twitter.com/eclipsesource

_______________________________________________
platform-releng-dev mailing list
platform-releng-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/platform-releng-dev

-- 
Paul Webster
Hi floor.  Make me a sammich! - GIR