Mercurial Workflow for small team

Posted by Tarski on Stack Overflow See other posts from Stack Overflow or by Tarski
Published on 2010-07-02T13:42:13Z Indexed on 2012/06/28 21:16 UTC
Read the original article Hit count: 191

Filed under:

mercurial

|

Workflow

I'm working in a team of 3 developers and we have recently switched from CVS to Mercurial. We are using Mercurial by having local repositories on each of our workstations and pulling/pushing to a development server. I'm not sure this is the best workflow, as it is easy to forget to Push after a Commit, and 3 way merge conflicts can cause a real headache. Is there a better workflow we could use, as I think the complexity of distributed VC is outweighing the benefits at the moment.

Thanks

© Stack Overflow or respective owner

Related posts about mercurial

Mercurial fails while commiting/updating/etc. using Mercuriual+TrueCrypt+MAC

as seen on Stack Overflow - Search for 'Stack Overflow'
While trying to work with Mercurial on project located on TrueCrypt partition I always get en error as follows: ** unknown exception encountered, details follow ** report bug details to http://mercurial.selenic.com/bts/ ** or [email protected] ** Mercurial Distributed SCM (version 1.5.2+20100502) **… >>> More
OS X, Mercurial and MediaTemple problem

as seen on Stack Overflow - Search for 'Stack Overflow'
I've installed Mercurial per MT's knowledge base file here. Working with it server side using ssh from my Mac works fine. I can initialize repositories and the like, but pulling from the server or pushing from my Mac produces an error I don't understand. Here's what I get when call hg push from… >>> More
Mercurial to Mercurial to Subversion Workflow Problem

as seen on Stack Overflow - Search for 'Stack Overflow'
We're migrating from Subversion to Mercurial. To facilitate the migration, we're creating an intermediate Mercurial repository that is a clone of our Subversion repository. All developers will be begin switching over to the Mercurial repository, and we'll periodically push changes from the intermediate… >>> More
How do I configure Mercurial to use environment variables in mercurial.ini

as seen on Stack Overflow - Search for 'Stack Overflow'
How can I modify the mercurial.ini file to include an environment variable such as %userprofile%. Specific situation: I am learning to use Mercurial. I have modified the [ui] section of Mercurial.ini (in my home path) to include: ignore = c:\users\user\.hgignore Where user is my username literal… >>> More
Mercurial: Problem converting Windows cvs repository to mercurial

as seen on Stack Overflow - Search for 'Stack Overflow'
I’m trying to convert an existing Windows CVS repository to Mercurial and getting the following response and error: C:\Windows\system32>hg convert c:\users\jeff\webs\shelter-cvs\shelter assuming destination shelter-hg initializing destination shelter-hg repository connecting to :local:c:\cvs abort:… >>> More

Related posts about Workflow

This task is currently locked by a running workflow and cannot be edited. Limitation to both Nintex and SPD workflow

as seen on YBBest - Search for 'YBBest'
Note, this post is from Nintex Forum here. These limitations apply to both SharePoint designer Workflow and Nintex Workflow as Nintex using the SharePoint workflow engine. The common cause that I experience is that ‘parent’ workflow is generating more than one task at once. This is common… >>> More
Multi-step Workflows: make Workflow A depend on results of Workflow B and/or Workflow C

as seen on Stack Overflow - Search for 'Stack Overflow'
I have been tasked with creating a Software Installation Approval section for our Intranet. When a person requests that a particular piece of software be installed on their workstation, we need to get IT approval and then business approval. Once those are obtained, it is to be installed. I am using… >>> More
Executing a workflow from another workflow ?

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi all I have a console sequential workflow that at a certain step I use the InvokeWorkflow activity to invoke another workflow and then check a certain value that is set by the second workflow, and continue the execution of the first workflow normally the problem is when InvokeWorkflow activity… >>> More
SharePoint Workflow: how to update the item without triggering the workflow again

as seen on Stack Overflow - Search for 'Stack Overflow'
I have a SharePoint workflow which is running whenever the item changes. The workflow communicates with an external REST service. If the service returns a string, I want to update one of the field values with that string. Unfortunately, this update will trigger another instance of the workflow for… >>> More
Custom Workflow migration to Windows Workflow foundation

as seen on Stack Overflow - Search for 'Stack Overflow'
I have an application that runs workflows custom developed in .Net 3.5. Now we want to build a case (to help customer understand) for migrating these custom workflows to WF. What should be the highlights of such a case? P.N: the customer has not asked for it but we want to build a case and present… >>> More