Help needed with workflow

Peter Loron peterl at standingwave.org
Fri Jan 23 09:43:34 UTC 2009


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello, all. We are looking at replacements for CVS, and the two I'm  
trying to decide between are Mercurial and Subversion. We have a very  
"traditional" workflow centered around a single repository. Mercurial  
appeals because of it's performance, ease of branching/cloning, ease  
of managed exchange of code between repos.

As far as I have been able to determine, a decentralized approach (no  
central repo, etc) isn't going to work for us. If a central/master/ 
reference repo is assumed, the workflow I can see is like this, in  
chronological order:

User1:
hg clone <master repo> repo
cd repo

User2:
hg clone <master repo> repo
cd repo

User1:
cat foo > newfile1.txt
hg ci -A -m "adding new file"
hg push <master repo>

User2:
cat foo > newfile2.txt
hg ci -A -m "adding new file"

Now when User2 goes to push his changes to the master repo, he gets  
the error about creating multiple heads. To resolve it he must:
hg pull <master repo>
hg merge
hg ci -m "merge results"
hg push <master repo>

Can anybody point out a more streamlined process or a different  
approach to the whole problem of needing to maintain a master/ 
reference repo?

Thanks!

- -Pete
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (Darwin)

iEYEARECAAYFAkl5kU0ACgkQ8kSp3b4WtL/4jQCffO6zxV4oKUePICnPOioj3iGy
ArgAni1XbVXDlNC3+4TCaIsOQklgRJ5H
=hD3f
-----END PGP SIGNATURE-----




More information about the Mercurial mailing list