From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SaBTU-0002rD-Am for garchives@archives.gentoo.org; Thu, 31 May 2012 19:56:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A35EE080B; Thu, 31 May 2012 19:55:47 +0000 (UTC) Received: from mail-yw0-f53.google.com (mail-yw0-f53.google.com [209.85.213.53]) by pigeon.gentoo.org (Postfix) with ESMTP id 600F6E07AB for ; Thu, 31 May 2012 19:54:53 +0000 (UTC) Received: by yhp26 with SMTP id 26so1164739yhp.40 for ; Thu, 31 May 2012 12:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=Ljy4dNwahBdHa5BD3iMv4aOpImaSc7H9k33pv3Imcgw=; b=a8p3eWTyycZvwMZE9rpAR8kRWImCamEHG4YSl0HMB7PP1trTfWZwB2lIEI4nE0K6A4 BV/d8RdNjxcgfoqm7amvBTemHq2I+jzUSBuVqQj8aKmlQUnyhW2q1+Z4jlhaDE+q36yj PtmbxINOzJeP79f3jy9h+5T8NR5gk6WR4ovoywjbD5nm7ICv/Nr1wN1yQQBKjaFS6HOz Pa/LjItaHnw4G0J3VsxP31oiqo2sA53DsOw7oNesNN1ADoMR1ArB0M3lwpNrHQ8f3dhz g64QdEeFF13Pa50Ex90GsI1zto0x01y0OtAyUvP3OhI8TUEmGEqxetgarH71/bH2skf3 r9lg== Received: by 10.60.3.34 with SMTP id 2mr3217075oez.27.1338494092776; Thu, 31 May 2012 12:54:52 -0700 (PDT) Received: from linux1 (cpe-76-187-77-158.tx.res.rr.com. [76.187.77.158]) by mx.google.com with ESMTPS id o4sm2596298oef.11.2012.05.31.12.54.51 (version=SSLv3 cipher=OTHER); Thu, 31 May 2012 12:54:52 -0700 (PDT) Sender: William Hubbs Received: by linux1 (sSMTP sendmail emulation); Thu, 31 May 2012 14:54:50 -0500 Date: Thu, 31 May 2012 14:54:50 -0500 From: William Hubbs To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] Re: Portage Git migration - clean cut or git-cvsserver Message-ID: <20120531195450.GA24805@linux1> Mail-Followup-To: gentoo-dev@lists.gentoo.org References: 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 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="liOOAslEiF7prFVr" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: 74a4630f-abcb-4f49-af9e-73bd842ad0e0 X-Archives-Hash: ac2f295be8557299b29d77eab05663b1 --liOOAslEiF7prFVr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, May 31, 2012 at 07:13:42PM +0000, Robin H. Johnson wrote: > - You have a commit, that you want to put into the Gentoo tree. > - You have already pushed it to your github, signed If I have a github tree, that would probably be because I didn't have push access to the official tree, so signing the commit probably isn'tgoing to matter; I would expect that a gentoo dev who has push access to the tree would sign the commit when it is put into the gentoo tree. > - It needs to be merged/rebased so that it applies on the Gentoo tree. > - If you force it to be a rebase so it applies on the tip, then you may > have changed the history of your github tree, and broken any further > forks. > - If you permit a merge instead, nobody gets broken. If you do this: git rebase master mybranch git checkout master git merge mybranch <-- this is a fast-forward merge git pull --rebase git push I think that covers this concern doesn't it? > > > 2. > > > Git-SVN breakage. Why does this matter you're wondering? > > > We need the newer Git for the commit signing, but it comes with a > > > price, the git-svn binary has some major failures with SVN 1.7. > > > Git since 1.7.8 has been broken this way. > > To clarify - these won't be issues for gentoo per se, but there is a > > sense that we can't stabilize the latest git because it will break it > > for people using git-svn on non-gentoo work? > As the Git maintainer, I will not keyword it for anybody until I know > it's not going to lose/corrupt data, regardless of what they are using > it for. Why not keyword it and use package.use.mask for the git-svn flag? William --liOOAslEiF7prFVr Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk/HzIoACgkQblQW9DDEZTjG1wCeNmutStVpkdnZENd6bYJIfB6+ 0AcAn3jYe3G4RD0/MfBhXrw6UwC9Bu/1 =XOsv -----END PGP SIGNATURE----- --liOOAslEiF7prFVr--