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 C2A331386F1 for ; Sun, 9 Aug 2015 10:03:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C94EEE0866; Sun, 9 Aug 2015 10:02:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C494E0864; Sun, 9 Aug 2015 10:02:59 +0000 (UTC) Received: from vapier (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with SMTP id B09BB340A78; Sun, 9 Aug 2015 10:02:56 +0000 (UTC) Date: Sun, 9 Aug 2015 06:02:56 -0400 From: Mike Frysinger To: gentoo-core@lists.gentoo.org, gentoo-dev@lists.gentoo.org, gentoo-scm@lists.gentoo.org Subject: [gentoo-scm] Re: [gentoo-core] [gentoo-dev] Git Migration: go-live! Message-ID: <20150809100256.GQ30077@vapier> Mail-Followup-To: gentoo-core@lists.gentoo.org, gentoo-dev@lists.gentoo.org, gentoo-scm@lists.gentoo.org References: <55C716C1.5050403@gentoo.org> <20150809093112.GB28996@schiffbauer.net> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo SCM discussions X-BeenThere: gentoo-scm@gentoo.org X-BeenThere: gentoo-scm@lists.gentoo.org Reply-To: gentoo-scm@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="yK/6QRnH3Zanb0EF" Content-Disposition: inline In-Reply-To: <20150809093112.GB28996@schiffbauer.net> X-Archives-Salt: 96f3a857-3662-4785-87be-bcfd29a1a8dc X-Archives-Hash: 23cdbc09e6e9781b8ce85262cae76dba --yK/6QRnH3Zanb0EF Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 09 Aug 2015 11:31, Marc Schiffbauer wrote: > * Michael Weber schrieb am 09.08.15 um 11:00 Uhr: > > On 08/09/2015 07:36 AM, Robin H. Johnson wrote: > > > I'm only 90% sure that everything works, but I've spent almost the=20 > > > entire day on it, and there's more to go tomorrow. > > Thanks a lot! > >=20 > > use case: my cvs tree had uncommitted ebuild work (yes, you caught me > > actually doing something). > > now `cvs diff` no longer works, how can i track down my local changes? > > besides diffing against git tree, brain memory aka shell history and > > find -newer? >=20 > I'd say:=20 >=20 > - tar your *.ebuild and files/* stuff away > - then "git clone" the new git repo. > - untar your files in the new git repo > - use "git diff" there will be a ton of cvs keyword noise in there though. need to run a sed on the files to clear it out. it also will include noise where your local checkout was behind the latest tree, so it'll only really work if you ran `cvs up` in the whole tree just before it was shutdown. -mike --yK/6QRnH3Zanb0EF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVxyVQAAoJEEFjO5/oN/WBERAP+wa1UFEIK+P/Xk+YYm6Xz04C a5/apOxNWbKlcOxjLSP/4Hzy6CbNw5L5WWqKlVhEpPCA27zqXgTZ6PGvagmbtrW/ 4HU6tk7pZ2OG0auNgFvHLkMCcrxoyel/WOpdJleVpFkX29PyrSf1Imv5svVS8rhg 8fHdZbmpWCB0L3ggUJI4mjtWK4LA8Zb/K3O3BbuvP//yuXfs7NRMsJocfYqBptpQ Bbl+jQ4bDdxKkaf6J0RXw/JthgY+yJNr7GXHJCXniZiEIjyjFsuiB5gp/CuUxcJK 4hHnMFC0dRr1IiiS2m1QfEJ46WxFNDrc/GbRVYQPR/yTeetdaLQA7CErphiy7NPB LQn/6tzfNvO2VzyF+vrk/GTyGNaQ9Bg1C3Bu7ZPK6nn82fo/YJXuu9XNG+rEmJSO v4bZpNy5eeva4eX/MAGbaQPbz2q2SzI4QHUdK4ugUKY/7X2ixn1nc+HhXnIkonjJ kHUGvFWufGHBN0hCC3OOnrBFspSx4f7zvr00nCMyi43rJpYTWcMQSJ+xPlsGgy4H 0+Eu0uBbWbGajZa4v/c6ZWvOG4wdj3b5VeQanQaNXEuWWesV4K3q+Vh99GhjNUp9 iBBkWRpCadCltmijDVx2Xsn1FK0T6tDrRvG0k4hzcLcXxdxk8WTO+/vhTggAjRbY 0wsPS2sC4WmWRocb3WxJ =jGr0 -----END PGP SIGNATURE----- --yK/6QRnH3Zanb0EF--