On Sat, Jun 11, 2011 at 1:31 PM, norricorp <span dir="ltr"><<a href="mailto:john@norricorp.f9.co.uk">john@norricorp.f9.co.uk</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Hi Na'Tosha,<br>
thanks for this. What about the situation where developer pulls latest from<br>
central to local, merges, tests and before he pushes back, another developer<br>
has pushed back.<br>
Presumably one wants to avoid a situation where there are several heads in<br>
the central repos.<br></blockquote><div><br>This is not allowed by default; the developer trying to push will be kindly told he cannot push because it will create multiple heads. Of course you can force-override this, but you have to do it willingly. So the developer trying to push will need to pull down the new changes and merge them in before he can push back.<br>
<br></div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
I will read the workflow wiki that you mention.<br></blockquote><div><br>Although I don't know much about Bazaar, I know they also have some good docs about possible workflows with DVCS systems that transfer well to Mercurial (or Bazaar or Git). They might also be of use.<br>
</div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Regards,<br>
john<br>
<font color="#888888"><br>
--<br>
View this message in context: <a href="http://mercurial.808500.n3.nabble.com/Mercurial-usage-tp3052184p3052301.html" target="_blank">http://mercurial.808500.n3.nabble.com/Mercurial-usage-tp3052184p3052301.html</a><br>
</font><div><div></div><div class="h5">Sent from the General mailing list archive at Nabble.com.<br>
_______________________________________________<br>
Mercurial mailing list<br>
<a href="mailto:Mercurial@selenic.com">Mercurial@selenic.com</a><br>
<a href="http://selenic.com/mailman/listinfo/mercurial" target="_blank">http://selenic.com/mailman/listinfo/mercurial</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br><div><div><span style="color: rgb(153, 153, 153);"><b>Na'Tosha Bard</b></span></div><div><font color="#999999">Build & Infrastructure Developer | Unity Technologies</font></div>
<div><font color="#999999"><br></font></div><div><font color="#999999"><b>E-Mail:</b> <a href="mailto:natosha@unity3d.com" target="_blank">natosha@unity3d.com</a></font></div><div><font color="#999999"><b>Skype:</b> natosha.bard</font></div>
</div><br>