From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 41EE71381F3 for ; Wed, 24 Apr 2013 13:25:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57FA2E0ACD; Wed, 24 Apr 2013 13:25:30 +0000 (UTC) Received: from mail-vb0-f47.google.com (mail-vb0-f47.google.com [209.85.212.47]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F687E0AB2 for ; Wed, 24 Apr 2013 13:25:29 +0000 (UTC) Received: by mail-vb0-f47.google.com with SMTP id x13so1626302vbb.20 for ; Wed, 24 Apr 2013 06:25:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type; bh=qQLbCnXepr5JFWX59IEHS2wJiGAvjzm3RiEh4fUsktk=; b=lJeY9c5YMFhdCtWoYK/qKdn7GpAQDwR+5RLxbiT0Mv9LdMELM+XIr84a0bL1Xhjv5q fPWk6ps/pC5Z9xp5UFkxI8TJrG21KfIfkF0NulH+1Z57lYlAKh0kYomVtJ5HAUXDVDPB idCeFw83TvpA3IZhe4J07ZJNha1Bs5iEaIZ7t5RzefR2nb8JrO0S1xcJSHnGvbl8BNp3 1vBPtGoygX5WlMAw8jbrUfnffOmnCpqnNEDZ3tKcBEDJhrRVqMDeCChzVIWkBDtXbAGO xKHWL9wOoT0BBW2As+vWD4X/37htUBX/cQVWVqzl+8zOUaw+MpluoR+s/XSaGzwJ0iz2 l5Qg== Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 X-Received: by 10.52.88.2 with SMTP id bc2mr6038142vdb.27.1366809928524; Wed, 24 Apr 2013 06:25:28 -0700 (PDT) Sender: freemanrich@gmail.com Received: by 10.52.168.4 with HTTP; Wed, 24 Apr 2013 06:25:28 -0700 (PDT) In-Reply-To: <5177C65E.6070404@gmail.com> References: <20130419091632.D01152171D@flycatcher.gentoo.org> <20130419153043.30ffc50c@portable> <20130421170549.41cfea49@portable> <20130422154033.65a68a40@portable> <20130423200053.77ed8b49@marga.jer-c2.orkz.net> <20130424112129.25885.qmail@stuge.se> <5177C65E.6070404@gmail.com> Date: Wed, 24 Apr 2013 09:25:28 -0400 X-Google-Sender-Auth: yWNTCWtKj3WLrZab861lROUpFj8 Message-ID: Subject: Re: [gentoo-dev] Re: [OT/NIT] Re: Re: [gentoo-commits] gentoo-x86 commit in profiles: ChangeLog package.mask From: Rich Freeman To: gentoo-dev Content-Type: text/plain; charset=ISO-8859-1 X-Archives-Salt: 0f2eba9d-9222-482a-baaa-8e026fef88b0 X-Archives-Hash: e24368bdc3a6aa1862f1029c422db901 On Wed, Apr 24, 2013 at 7:47 AM, Michael Mol wrote: > > 13. Gerrit's push to tree fails, since tree with changeset A isn't in > changeset B's ancestry. > Honestly, this is a problem with any use of repoman with git unless you let the server auto-merge trivial changes. Cvs tracks commits at the file level, and git does it at the repository level. The chances of somebody modifying the same files in the time it takes you to stage, test, and commit a change in cvs are fairly low. The chances of somebody making any commit to the repository in the time it takes you to rebase, do a repoman check, and push are much higher. We might have to live with repoman being a manual process - then you'd just pull/rebase-or-merge/push to get it to the tree and use your brain to determine if it causes any problems (which does require responsibility). However, your specific example could be modified a bit to make it more robust: 1. Dev A pulls from tree 2. Dev A merges those changes with his local copy of tree 3. Dev A pushes to Gerrit 4. Gerrit begins tests on changeset A 5. Dev B pulls from tree (or perhaps he pulled earlier) 6. Gerrit is still testing changeset A 7. Dev B merges those changes with his local copy of tree 8. Gerrit finishes testing, pushes to tree 9. Dev B's push to Gerrit fails, since Gerrit's head isn't in B's ancestry. 10. Dev B pulls, rebases, and re-pushes - possibly pulling directly from Gerrit to reduce latency. It still fails when you get high volumes, because the fundamental issue is that it can only handle as many commits as Gerrit can test in a given period of time, plus various latencies. Rich