Path: csiph.com!x330-a1.tempe.blueboxinc.net!feeder1.hal-mli.net!news.glorb.com!news.astraweb.com!border6.newsrouter.astraweb.com!not-for-mail From: Ben Finney Newsgroups: comp.lang.python Subject: Re: [OT] Comparing VCS tools References: <58a6bb1b-a98e-4c4a-86ea-09e040cb2d21@r35g2000prj.googlegroups.com> <201104270442.15810.akabaila@pcug.org.au> <87liywmmyl.fsf@benfinney.id.au> X-Public-Key-ID: 0xAC128405 X-Public-Key-Fingerprint: 517C F14B B2F3 98B0 CB35 4855 B8B2 4C06 AC12 8405 X-Public-Key-URL: http://www.benfinney.id.au/contact/bfinney-pubkey.asc X-Post-From: Ben Finney Date: Wed, 27 Apr 2011 16:51:52 +1000 Message-ID: <874o5kmbjr.fsf@benfinney.id.au> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) Cancel-Lock: sha1:QDn7nopXdDatGeAYO3DmX6e5goc= MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Lines: 24 Organization: Unlimited download news at news.astraweb.com NNTP-Posting-Host: 3eb46781.news.astraweb.com X-Trace: DXC=1ICD[kMkWBCI]J2Y9=AF]JL?0kYOcDh@JN7:H2`MmAUC3bEJ6cEhU?H]G;2>V^?kWCbEW9A[5UK?ENZ[SL`C\KgCUlF58LPFWhE Xref: x330-a1.tempe.blueboxinc.net comp.lang.python:4114 Ben Finney writes: > Tim Chase writes: > > Mercurial (hg) > > ============== […] > > Cons: > > - no biggies that I've found > > - (Anecdotal) Merge algorithm sometimes fails catastrophically. I'm going to retract this one point. Merging is not as clear as in Bazaar, but not enough to count against Mercurial – and certainly not “fail”. > - Merged revisions aren't hidden, leading users to alter history. This still stands as a point against Mercurial (and against Git). -- \ “Always code as if the guy who ends up maintaining your code | `\ will be a violent psychopath who knows where you live.” —John | _o__) F. Woods | Ben Finney