From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: thomas@koch.ro
Cc: git@vger.kernel.org
Subject: Re: intend-to-edit flag
Date: Thu, 4 Jul 2013 20:10:07 +0200 [thread overview]
Message-ID: <CACBZZX5tj0EpV7rv6FymSJunPY-Hs1fJrAmmAOnbEb9WKykmYg@mail.gmail.com> (raw)
In-Reply-To: <2240842.MQEMCLPV8Z@x121e>
On Thu, Jul 4, 2013 at 7:56 PM, Thomas Koch <thomas@koch.ro> wrote:
> we're evaluating Git to be used in our companies Tool. But a hard requirement
> is the possibility to set an "intend-to-edit" flag on a file (better path).
> Notice that I did not use the word "lock"! :-)
>
> One easy implementation might be a special branch "XYZ-locks" that contains an
> empty blob for every flagged file. So our tool just needs to check, whether a
> blob exists for the path that's intended to edit, tries to push a commit that
> touches the file and only allows editing if the push succeeds.
In my experience everyone who thinks this is a hard requirement is
wrong.
Sure you can implement something to do this, but more likely than not
you think you need it because your current centralized SCM does it and
you think you can't live without it.
I work with a couple of hundred devs all grinding on the same
repository and it's really rare to have:
* People who edit the same code within each other's pull/push window AND
* Have the edits to those files not be smoothly resolved by automatic
merging (i.e. because it was to completely different parts of the
file).
When it does happen every once in a while it's trivial to solve it,
you just resolve conflicts, talk to the other guy etc.
Why don't you just start using Git and see if this becomes a practical
problem rather than devising some elaborate solution to work around
something that probably won't be an issue anyway?
next prev parent reply other threads:[~2013-07-04 18:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-04 17:56 intend-to-edit flag Thomas Koch
2013-07-04 18:10 ` Ævar Arnfjörð Bjarmason [this message]
2013-07-04 18:19 ` John Keeping
2013-07-04 18:25 ` Thomas Koch
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=CACBZZX5tj0EpV7rv6FymSJunPY-Hs1fJrAmmAOnbEb9WKykmYg@mail.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=thomas@koch.ro \
/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).