git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: auto-merge after push?
Date: Wed, 15 Jul 2009 17:54:30 +0300	[thread overview]
Message-ID: <20090715145430.GB9075@redhat.com> (raw)
In-Reply-To: <7vocrplhbv.fsf@alter.siamese.dyndns.org>

On Sun, Jul 12, 2009 at 02:30:44PM -0700, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > Well, I use it myself, what more can I say?
> 
> It's rather hard to justify a feature that is available to the general
> public with documentation that only says "we tell you what happens in
> terms of low-level commands when you use this feature, we warn you that
> this has its own set of possible complications, but we do not specify what
> they are, nor how to recover from them. You should know what you are doing
> if you choose to use it".
> 
> That is not very helpful.
> 
> If this _were_ implemented as a sample hook on the receiving end, with
> ample comments that the users can read to undersand the issues before
> deciding to install it on their repositories, it might have been an easier
> sell.
> 
> If Dscho is short on time, perhaps somebody else can improve upon the
> documentation part of the patch?  It's a long time ago that I took a look
> at the patch text itself but I had a recorrection that the code itself was
> reasonable (and it is a well known fact that I tend not to notice bugs in
> Dscho's code so it is not a very useful thing for me to go back to look at
> the code again now when I am short on brain cycles).
> 

So, let me summarize the issues:
- if the tree is pushed into while files are being actively read
  (e.g. built from), the build will get an inconsistent state
- even worse if one of the files is open for editing or is being written
  into: the file will get corrupted
- if there are uncommitted changes in the tree, the push is denied

Are there others?

-- 
MST

  parent reply	other threads:[~2009-07-15 14:55 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-11 14:23 auto-merge after push? Michael S. Tsirkin
2009-05-11 14:35 ` Jakub Narebski
2009-05-11 15:18 ` Johannes Schindelin
2009-05-11 20:17   ` Michael S. Tsirkin
2009-05-11 21:03     ` Johannes Schindelin
2009-05-11 21:13       ` Michael S. Tsirkin
2009-05-11 23:29         ` Johannes Schindelin
     [not found]       ` <20090511211215.GC21045@redhat.com>
2009-05-11 23:28         ` Johannes Schindelin
2009-05-19  9:36       ` Michael S. Tsirkin
2009-06-11 10:40       ` Michael S. Tsirkin
2009-07-11 20:38         ` Michael S. Tsirkin
2009-07-12  2:42           ` Johannes Schindelin
2009-07-12 21:30             ` Junio C Hamano
2009-07-12 22:31               ` Johannes Schindelin
2009-07-15 14:54               ` Michael S. Tsirkin [this message]
2009-07-15 19:31                 ` Junio C Hamano
2009-07-15 19:57                   ` Michael S. Tsirkin
2009-07-16  8:01                     ` Johannes Schindelin

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=20090715145430.GB9075@redhat.com \
    --to=mst@redhat.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).