What are some arguments against locking?

Michael Smith michael.smith at thalesatm.com
Wed Jun 25 18:03:10 CDT 2008


Johannes Stezenbach wrote:

> I'm not suggesting locking is the solution, but we should acknowledge
> that the problem exists, even though a DVCS cannot solve it.

Mercurial allows you to customize the merge script, so if your solution 
is to always take the later one, or copy the file, then you can automate 
that.
-- 
Michael Smith        | 61 386 304 560
Case and Tools Team  | 61 416 062 898
Thales Australia TCC |    S  37.82329
Melbourne, Victoria  |    E 144.95426
--------------------------------------------
Confidentiality Notice: This e-mail may contain confidential and/or 
privileged information and is intended solely for the addressee(s) 
named. If you have received this information in error, or are advised 
that you have been posted this e-mail by accident, please notify the 
sender by return e-mail, do not redistribute it, delete the e-mail and 
keep no copies.


More information about the Mercurial mailing list