git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Potapov <dpotapov@gmail.com>
To: Mario Pareja <mpareja.dev@gmail.com>
Cc: Andreas Ericsson <ae@op5.se>, Git Mailing List <git@vger.kernel.org>
Subject: Re: Locking binary files
Date: Wed, 24 Sep 2008 00:46:16 +0400	[thread overview]
Message-ID: <20080923204616.GS21650@dpotapov.dyndns.org> (raw)
In-Reply-To: <94c1db200809230656q4a9a765dw2354c0058b1d940c@mail.gmail.com>

On Tue, Sep 23, 2008 at 09:56:57AM -0400, Mario Pareja wrote:
> 
> The SVN client will make locked files read-only until a lock is
> obtained for them.  This helps "remind" you that a lock should be
> obtained before editing such a file. Requiring the developer to obtain
> a lock ensures that nobody else is editing the file and prevents
> wasted work.  Upon commit, the file is marked as unlocked and the
> local file is once again read-only.

The approach that SVN takes is not only impossible for distributed
environment, it does not work even in a _single_ repository where you
have branching and merging. If you have a topic branch then your lock
will have a zero effect on other developers or lock of other developers
on you. Obviously, you are going to have the binary merge conflict at
the end. But it is even worse than that. Somebody locked a file on the
master branch and you clone from it. Now, this somebody unlocked this
file, but this file on your branch remains locked but this person, and
this person may even not aware that about your branch. That is insane!

Dmitry

  parent reply	other threads:[~2008-09-23 20:47 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <94c1db200809222333q4953a6b9g8ce0c1cd4b8f5eb4@mail.gmail.com>
2008-09-23  6:39 ` Locking binary files Mario Pareja
2008-09-23  7:18   ` Andreas Ericsson
     [not found]     ` <94c1db200809230054t20e7e61dh5022966d4112eee6@mail.gmail.com>
2008-09-23  8:31       ` Andreas Ericsson
2008-09-23 13:56         ` Mario Pareja
2008-09-23 14:28           ` Alex Riesen
2008-09-23 17:32           ` Daniel Barkalow
2008-09-23 19:49             ` Junio C Hamano
2008-09-23 21:13               ` Daniel Barkalow
2008-09-23 21:54                 ` Dmitry Potapov
2008-09-23 22:29                   ` Daniel Barkalow
2008-09-23 23:21                     ` Dmitry Potapov
2008-09-24  4:15                       ` Daniel Barkalow
2008-09-24 15:00                         ` Dmitry Potapov
2008-09-23 20:46           ` Dmitry Potapov [this message]
2008-09-23 11:16   ` Boaz Harrosh
2008-09-23 11:20     ` Boaz Harrosh
2008-09-23 14:14     ` Mario Pareja
2008-09-23 14:35       ` Boaz Harrosh
2008-09-23 13:44   ` Dmitry Potapov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080923204616.GS21650@dpotapov.dyndns.org \
    --to=dpotapov@gmail.com \
    --cc=ae@op5.se \
    --cc=git@vger.kernel.org \
    --cc=mpareja.dev@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).