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 1Lbf0G-0003as-Eq for garchives@archives.gentoo.org; Mon, 23 Feb 2009 17:54:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19960E04CF; Mon, 23 Feb 2009 17:54:03 +0000 (UTC) Received: from static.21.48.46.78.clients.your-server.de (static.21.48.46.78.clients.your-server.de [78.46.48.21]) by pigeon.gentoo.org (Postfix) with ESMTP id E24BEE04CF for ; Mon, 23 Feb 2009 17:54:02 +0000 (UTC) Received: by static.21.48.46.78.clients.your-server.de (Postfix, from userid 1007) id 01E081738B8; Mon, 23 Feb 2009 18:54:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.2.1 (2007-05-02) on 0815-web.localdomain X-Spam-Level: X-Spam-Status: No, score=-102.6 required=5.0 tests=AWL,BAYES_00,NO_RECEIVED, NO_RELAYS,USER_IN_WHITELIST autolearn=ham version=3.2.1 Message-ID: <49A2E2B7.50107@j-schmitz.net> Date: Mon, 23 Feb 2009 18:53:59 +0100 From: Justin User-Agent: Thunderbird 2.0.0.19 (X11/20090203) 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 To: gentoo-science@lists.gentoo.org Subject: Re: [gentoo-science] Re: overlay move to git References: <1235331956.19524.31.camel@localhost> <20090223090855.76aac1b2@gentoo.org> <200902231318.25035.alexxy@gentoo.org> <49A2978A.40301@j-schmitz.net> In-Reply-To: <49A2978A.40301@j-schmitz.net> X-Enigmail-Version: 0.95.7 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig2E110889A9464EEFA10FFE9E" X-Archives-Salt: 0c323b62-b9c3-4489-8fcb-73bb76a4c4af X-Archives-Hash: cac834c0bff6e7aa6ef5bf9be61847bc This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig2E110889A9464EEFA10FFE9E Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Justin schrieb: > Alexey Shvetsov schrieb: >> On =D0=9F=D0=BE=D0=BD=D0=B5=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D0=B8=D0=BA = 23 =D1=84=D0=B5=D0=B2=D1=80=D0=B0=D0=BB=D1=8F 2009 10:08:55 Flammie Pirin= en wrote: >>> 2009-02-22, My Th sanoi: >>>> There is my work flow with git on Science overlay. >>>> >>>>> $ 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 >>> 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 l= ast thread >>> when I asked advice no one replied, so I just did something along the= >>> lines of: >>> >>> $ git pull >>> $ vim >>> $ git commit >>> $ git push >>> >>> During my last update. It seemed like it worked though? Will somethin= g >>> break soon if I continue to use this set of commands? What is the wor= k >>> 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= =2E >> Better >> $ git pull=20 >> $ vim >> $ echangelog >> $ repoman commit >> $ git push >> >=20 > But whats important from alexxy's solution is, that if you cannot push,= > because your HEAD is not up2date than do >=20 > git pull --rebase >=20 > and not only >=20 > git pull >=20 Sorry wasn't alexxys solution, it was from rei4dan. But I hit some bad thing, I am working alot with branches and noted that the .git dir growths and growths, although I removed the branches. Can I clean this up? --------------enig2E110889A9464EEFA10FFE9E Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEARECAAYFAkmi4rcACgkQgAnW8HDreRaX4QCgn2PmzJJogeZn82w3S55/wt4r kp0AoLfl2h8+RTk1rSrOswsLO7Lnp7Ws =ZtK/ -----END PGP SIGNATURE----- --------------enig2E110889A9464EEFA10FFE9E--