From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LbKHI-0003Ur-1W for garchives@archives.gentoo.org; Sun, 22 Feb 2009 19:46:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AE5DE0336; Sun, 22 Feb 2009 19:46:15 +0000 (UTC) Received: from mail-fx0-f161.google.com (mail-fx0-f161.google.com [209.85.220.161]) by pigeon.gentoo.org (Postfix) with ESMTP id DA203E0336 for ; Sun, 22 Feb 2009 19:46:14 +0000 (UTC) Received: by fxm5 with SMTP id 5so1174561fxm.10 for ; Sun, 22 Feb 2009 11:46:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:in-reply-to :references:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=p9EeYK5Og5k8p6p2uucfKDhxR5PfznvHhpn/zgutcq8=; b=xEmmcGX/2yE1X23DU654qXKbExIbPiASnylDAHhcYSPfmqsHqeIur2FfsHpLS0ZhzZ u4CADZh6OVOFaB8zlA0x+9TErH2tN3zmF4vLhkWI2jAmtUKiBN0ZFTDzUra/1Ajd3QOf BTqSoxUs0GHcSP1e5SqULnyyThukqYDe0Zncc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:in-reply-to:references:content-type:date:message-id :mime-version:x-mailer:content-transfer-encoding; b=umZAX3qS6UpaneOD1i1JKFkZtqY2jgluULilfT2Ahxx780sMHCQxaT/sXfqXvXC2xQ haQcmu//uuLVzi0fB92syIWbsIGwPVSloGPbCT3ziLfbawbEPG/vWWmIS7xKxdafHX4N 49+M38Kxpwadb0Tb+G4aeb8Mm3xEfS30AFMDs= Received: by 10.103.241.15 with SMTP id t15mr2907349mur.85.1235331974269; Sun, 22 Feb 2009 11:46:14 -0800 (PST) Received: from ?95.68.107.241? ([95.68.107.241]) by mx.google.com with ESMTPS id y2sm3968894mug.15.2009.02.22.11.46.12 (version=SSLv3 cipher=RC4-MD5); Sun, 22 Feb 2009 11:46:13 -0800 (PST) Subject: Re: [gentoo-science] Re: overlay move to git From: My Th To: gentoo-science@lists.gentoo.org In-Reply-To: <20090220154412.5f27c060@maracuja> References: <20090220154412.5f27c060@maracuja> Content-Type: text/plain Date: Sun, 22 Feb 2009 21:45:56 +0200 Message-Id: <1235331956.19524.31.camel@localhost> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-science@lists.gentoo.org Reply-to: gentoo-science@lists.gentoo.org Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Content-Transfer-Encoding: 7bit X-Archives-Salt: fb5d7825-bc51-48c4-b12c-2672ede9b108 X-Archives-Hash: 3c21b2bbe42f3ad5d7e5c749b09063d9 Hi! There is my work flow with git on Science overlay. Create a local copy of science overlay if you have ssh access: >$ git clone git+ssh://git@git.overlays.gentoo.org/proj/sci.git Or if you don't have one: >$ git clone git://git.overlays.gentoo.org/proj/sci.git Or update existing one: >$ git pull origin Create a new branch for work to be committed: >$ git branch $NAME >$ git checkout $NAME ... edit ... >$ git add $FILES >$ export ECHANGELOG_USER="Your Name " >$ echangelog >$ ebuild *.ebuild digest >$ repoman -p full >$ git add $FILES >$ git status >$ git commit Try to push changes to overlay and check whether there have been changes to overlay during your work: >$ git push --dry-run -v origin HEAD:master If so update master and rebase your branch: >$ git checkout master >$ git pull origin >$ git checkout $NAME >$ git rebase master Push your changes, update master and delete your temporary branch: >$ git push --dry-run -v origin HEAD:master >$ git push -v origin HEAD:master >$ git checkout master >$ git pull origin >$ git branch -d $NAME Or format a patch and send via mail to developer (using send-mail or as an attachment): >$ git format-patch -1 >$ git send-email --to someone@gentoo.org --suppress-from 0001-yo.patch Git formatted patches can be applied and pushed to overlay: >$ git am 0001-your-package.patch >$ git push --dry-run -v origin HEAD:master >$ git push -v origin HEAD:master >$ git checkout master >$ git pull origin >$ git branch -d NAME Command "gitk" can be used to view your git tree graphically. Other commands which might interest more are: git remote, git rebase. Git "push origin" can be used only when your local copy has been created using git+ssh, otherwise full address has to be used or another named remote has to be created. Hope it might be useful to somebody. Cheers, Reinis