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 1Lba1i-0007Y2-Sc for garchives@archives.gentoo.org; Mon, 23 Feb 2009 12:35:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F754E03EC; Mon, 23 Feb 2009 12:35:13 +0000 (UTC) Received: from mail-bw0-f157.google.com (mail-bw0-f157.google.com [209.85.218.157]) by pigeon.gentoo.org (Postfix) with ESMTP id E1BE8E03EC for ; Mon, 23 Feb 2009 12:35:12 +0000 (UTC) Received: by bwz1 with SMTP id 1so4628804bwz.10 for ; Mon, 23 Feb 2009 04:35:12 -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=e9YNNOOZ4UvGLGKfWyMcXOzlRD5c+ZsXYz7QIF3t3nU=; b=xMSMI+8I9g/7r7HfPe4nysJ3m/Cj/lPWFxRNOau82GHkmRD/J7XRyhoNNBXCzWoXQO OAY//lGdi0QxePY0BGOTBOBcxsk2dwRjpdPmmMhQLExYFPj2GsiMdNj5UQbemSGrDogH BpPRlx74IcZ4en06r0rxKGiuaU9mDYPWJmIY0= 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=pGslHkQkr0z69UAGhoyAEIb5KY5INo+uyFezD/pOS4fmKji0t/ROJ/nSNSc2PUci3x 6Ekg49v/ziHEbzsAF3yP6GMxF5mHJTXHHbAHPDf9cWqXjS1PWRTGjhmu2Qyk5iQtMOuB O+mNniQDP5IVjmWmTDzLBH61gI1faxbjWokeU= Received: by 10.223.118.15 with SMTP id t15mr4602593faq.101.1235385843218; Mon, 23 Feb 2009 02:44:03 -0800 (PST) Received: from ?192.168.1.102? (osi187.osi.lv [195.13.135.187]) by mx.google.com with ESMTPS id z15sm1732173fkz.31.2009.02.23.02.44.02 (version=SSLv3 cipher=RC4-MD5); Mon, 23 Feb 2009 02:44:02 -0800 (PST) Subject: Re: [gentoo-science] Re: overlay move to git From: My Th To: gentoo-science@lists.gentoo.org In-Reply-To: <20090223090855.76aac1b2@gentoo.org> References: <20090220154412.5f27c060@maracuja> <1235331956.19524.31.camel@localhost> <20090223090855.76aac1b2@gentoo.org> Content-Type: text/plain; charset=utf-8 Date: Mon, 23 Feb 2009 12:43:55 +0200 Message-Id: <1235385835.19522.10.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: quoted-printable X-Archives-Salt: bf0acfc1-8a6e-4bf8-8103-4daa7ffc62c7 X-Archives-Hash: 22a8d8c407a3985105a1150101d01782 Yes, it can be shortened, but basically it goes along with the same lines as your work flow and in addition: - use echangelog to write ChangeLog - use repoman to check ebuilds - create temporary branch for easier coping with others commits The last one (using git rebase) lets avoid master branch merge commits (like the one in your commit). I also started to use git just recently (a week ago), so I might do some unnecessary things or maybe this work flow can be simplified.. If you see were and how, I would happily take an advice. Cheers, Reinis P , 2009-02-23 09:08 +0200, Flammie Pirinen rakst=C4=ABja: > 2009-02-22, My Th sanoi: >=20 > > There is my work flow with git on Science overlay. >=20 > > >$ git clone git+ssh://git@git.overlays.gentoo.org/proj/sci.git > > >$ git branch $NAME > > >$ git checkout $NAME > > ... edit ... > > >$ git add $FILES > > >$ export ECHANGELOG_USER=3D"Your Name " > > >$ echangelog > > >$ ebuild *.ebuild digest > > >$ repoman -p full > > >$ git add $FILES > > >$ git status > > >$ git commit > > >$ git push --dry-run -v origin HEAD:master > > >$ git checkout master > > >$ git pull origin > > >$ git checkout $NAME > > >$ git rebase master > > >$ git push --dry-run -v origin HEAD:master > > >$ git push -v origin HEAD:master > > >$ git checkout master > > >$ git pull origin > > >$ git branch -d $NAME >=20 > I wonder if this short and simple work flow is really all necessary. I > have to admit I have no prior experience with DVCS=E2=80=99s and in las= t thread > when I asked advice no one replied, so I just did something along the > lines of: >=20 > $ git pull > $ vim > $ git commit > $ git push >=20 > During my last update. It seemed like it worked though? Will something > break soon if I continue to use this set of commands? What is the work > flow for trivial version bump, if so? I would hope that I do not have > to execute some 22 commands every time I bump my packages from now on. >=20