will hg pull & update go smooth if conflicts are resolved before going to master

[Isaac Jurado]

On Wed, Jan 16, 2013 at 7:26 PM, Kate Pena <999iscool at gmail.com> wrote:
> Hi,
>
> It might be a noob question :)
> Suppose conflicts are resolved, and committed. Now the developer's code
> finally get into the master repo, which only gets updated when tests
> (continuous integration) says so.
> Now it's time to deploy the new code on our machines. By doing pull &
> update, can we guarantee smooth pull and update? No more conflicts?

If the repository from where you do  the pull & update (I'm guessing
the deploy machine) has a clean working copy (that is, no uncommitted
changes), there should be no trouble at all.  At work, we use
Mercurial to deploy changes with standard branching [1] and has been
worked great so far.

There is only one situation where "hg update" will perform a merge
operation and, thus, potentially lead to conflicts: when you have
uncommitted changes and you update to a different revision.

[1] http://mercurial.selenic.com/wiki/StandardBranching

-- 
Isaac Jurado

"The noblest pleasure is the joy of understanding"
Leonardo da Vinci