How to start, first set up a main repository on Bitbucket?

Tue Nov 4 18:52:46 UTC 2014

Don't mean to split hairs, but the order of things here matters a bit: commit (many, many times), pull (many, many times), merge with each pull (many times). When ready to inflict their changes on other members, pull one last time, merge if needed; if not needed, then (and only then) push.

I'm not all that familiar with BitBucket, so it may already enforce this, but you don't want to do a merge on the shared, synchronizing repository. Make sense? The problem is that between the time the user(s) last checked, someone else may have pushed their changes, and your push would then result in branches on the shared repo (in BitBucket). To avoid that, you always want to do a pull until there are no more merges coming in, then do a push. So, always do a pull before a push; however, if the pull results in a merge, that merge will take long enough that someone else may have pushed again, so when you finish with the merge, do yet another pull. Only when the pull comes back empty, do you do a push. (It's not the end of the world if multiple heads occur on the main repo, but it can be quite unpleasant. If you are tasked by an angry mob with pitchforks and torches to "Fix it!", you won't do it twice.)

Tenova: advanced technologies for the metals and mining industries
Visit our website at www.tenova.com
------------------------------------------------------------------
Confidentiality Notice : This message, together with its attachments, contains strictly confidential information and is intended only for the addressee identified above,who is the sole party authorized to use
 and copy it and, assuming any related liability , to forward it to others. Anyone receiving this message by mistake or reading it without authorization is hereby notified that storage, reproduction, disclosure or distribution of the message to persons other than the addressee is strictly forbidden. They are asked to return the message immediately to the sender and to erase the original message received.
Thank you.

-----Original Message-----
From: mercurial-bounces at selenic.com [mailto:mercurial-bounces at selenic.com] On Behalf Of Eyvind Almqvist
Sent: Tuesday, November 04, 2014 1:07 PM
To: Adrian Klaver; mercurial at selenic.com
Subject: Re: How to start, first set up a main repository on Bitbucket?

Thanks, very useful information! Is this a good approach:

1) Set up a main repository on Bitbucket.

2) Someone in the team makes an almost empty Eclipse project and pushes it up to the main repository.

3) The others in the team will then clone the main repository. They will get almost empty Eclipse project, so they have something to start with.

4) The team members can start coding and when they are ready commit, push, pull and update.

I am really sorry for posting the same thread twice! I didn't think that I was registered when I posted the first time, so I didn't think it got posted.

-----Original Message-----
From: Adrian Klaver
Sent: Tuesday, November 04, 2014 3:36 PM
To: Eyvind Almqvist ; mercurial at selenic.com
Subject: Re: How to start, first set up a main repository on Bitbucket?

On 11/04/2014 06:10 AM, Eyvind Almqvist wrote:
> I am going to set up Mercurial for a small team. I am not sure how to
> start. First set up a main repository on Bitbucket? Should the team
> members then clone this repository? Can they begin making changes,
> commiting,  pulling and updating after that?

The BitBucket docs cover this:

https://confluence.atlassian.com/display/BITBUCKET/Bitbucket+Documentation+Home;jsessionid=7C5357C

Not sure how small a team you are talking about so you might want to look at this:

https://confluence.atlassian.com/display/BITBUCKET/Plans+and+billing

>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>

--
Adrian Klaver
adrian.klaver at aklaver.com

_______________________________________________
Mercurial mailing list
Mercurial at selenic.com
http://selenic.com/mailman/listinfo/mercurial