From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.54) id 1FZoWD-0004i2-LV for garchives@archives.gentoo.org; Sat, 29 Apr 2006 12:25:50 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.6/8.13.6) with SMTP id k3TCOitI015194; Sat, 29 Apr 2006 12:24:44 GMT Received: from smtp.ferdyx.org (170.Red-213-96-222.staticIP.rima-tde.net [213.96.222.170]) by robin.gentoo.org (8.13.6/8.13.6) with ESMTP id k3TCLs50007605 for ; Sat, 29 Apr 2006 12:21:54 GMT Received: from localhost (localhost [127.0.0.1]) by smtp.ferdyx.org (Postfix) with ESMTP id 1724B8D393 for ; Sat, 29 Apr 2006 14:20:29 +0200 (CEST) Received: from smtp.ferdyx.org ([127.0.0.1]) by localhost (tungsteno [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 08686-01 for ; Sat, 29 Apr 2006 14:20:24 +0200 (CEST) Received: from posidon.ferdyx.org (posidon.ferdyx.org [192.168.0.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.ferdyx.org (Postfix) with ESMTP id ACDD08D34F for ; Sat, 29 Apr 2006 14:20:23 +0200 (CEST) Received: by posidon.ferdyx.org (nbSMTP-1.01-cvs) for uid 1000 (using TLSv1/SSLv3 with cipher DHE-RSA-AES256-SHA (256/256 bits)) ferdy@gentoo.org; Sat, 29 Apr 2006 14:21:48 +0200 (CEST) Date: Sat, 29 Apr 2006 14:21:47 +0200 From: "Fernando J. Pereda" To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] Gentoo: State of the Union Message-ID: <20060429122147.GA13685@ferdyx.org> Mail-Followup-To: gentoo-dev@lists.gentoo.org References: <20060428171453.GB62035@watcher.kimaker.com> <44527A01.3080506@gentoo.org> <20060428204240.GD63263@watcher.kimaker.com> <200604291502.47183.danarmak@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@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: <200604291502.47183.danarmak@gentoo.org> User-Agent: Mutt/1.5.11 X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at ferdyx.org X-Archives-Salt: 08653f86-1122-41d3-8a89-cda10d7ad1b7 X-Archives-Hash: 0352a874997854a1ddc204a7921dec90 --liOOAslEiF7prFVr Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Apr 29, 2006 at 03:02:46PM +0300, Dan Armak wrote: > On Friday 28 April 2006 23:42, Ryan Phillips wrote: > > svn > > + Atomic Commits > > + Merging/tagging/brancing is a simple "copy" operation > > http://svnbook.red-bean.com/en/1.1/ch04.html > > + lots of benefits > > http://svnbook.red-bean.com/nightly/en/svn.intro.features.html > > there is more I'm sure people can come up with > > - 2x Drive space >=20 > - No changeset/merge tracking >=20 > If we have a lot of active branches and a lot of merging between them,=20 > changeset tracking could be a major plus. I've never used git but I've he= ard=20 > that it, and other distributed development-style SCMs, have changeset/mer= ge=20 > tracking features that are really helpful. Could someone who's used them= =20 > comment on this? Yes, Git tracks merges unless the merge is trivial (aka fast-forward). When you merge branch 'a' into branch 'b' and 'b' is a strict subset of 'a' we call that a fast-forward, since there is no merge anywhere: o---o---o "b" \ x---x---x "a" If you merge 'a' into 'b' (git checkout b ; git pull . a) the result is: o---o---o---x---x---x "a" =3D "b" However in the following case, a proper merge is required: o---o---o---#---# "b" \ x---x---x "a" 'b' is not a strict subset of 'a' because the commits marked with # do not exist in 'a', so the thing ends up being: o---o---o---#---#---@ "b" \ / x---x---x "a" The commit marked with @ is a special comit called a 'merge'. I hope that clarifies the merge tracking part. However I don't know what do you mean with 'changeset tracking'. Cheers, Ferdy --=20 Fernando J. Pereda Garcimart=EDn Gentoo Developer (Alpha,net-mail,mutt,git) 20BB BDC3 761A 4781 E6ED ED0B 0A48 5B0C 60BD 28D4 --liOOAslEiF7prFVr Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) iD8DBQFEU1pbCkhbDGC9KNQRAjK6AJ9JsdgVqDFk2JPg2/QZt5aJjARWoACfZz4g ADuqm9cyOZST1xNzSiIQ+Bc= =V1IL -----END PGP SIGNATURE----- --liOOAslEiF7prFVr-- -- gentoo-dev@gentoo.org mailing list