From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Maus Subject: Re: Re: Org-mode release 7.01 Date: Mon, 19 Jul 2010 21:27:01 +0200 Message-ID: <87mxtnz30a.wl%dmaus@ictsoc.de> References: <4EED441F-C7A5-43DD-A3C1-3BF478BAAFD2@gmail.com> <0vmxtnpf4i.fsf@gmail.com> <87tynv1ido.fsf@gmx.net> <0viq4bpdo6.fsf@gmail.com> <87lj97fi0l.fsf@gmx.net> <0veiezpbik.fsf@gmail.com> <4C449BB6.4090508@ccbr.umn.edu> <0vaapnpaxw.fsf@gmail.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/mixed; boundary="===============0328333666==" Return-path: Received: from [140.186.70.92] (port=47144 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OavzX-00074H-Lw for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 15:27:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OavzV-0002T5-UB for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 15:27:07 -0400 Received: from mysql1.xlhost.de ([213.202.242.106]:54992) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OavzV-0002Sl-K3 for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 15:27:05 -0400 In-Reply-To: <0vaapnpaxw.fsf@gmail.com> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Markus Heller Cc: emacs-orgmode@gnu.org --===============0328333666== Content-Type: multipart/signed; boundary="pgp-sign-Multipart_Mon_Jul_19_21:27:00_2010-1"; micalg=pgp-sha256; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit --pgp-sign-Multipart_Mon_Jul_19_21:27:00_2010-1 Content-Type: text/plain; charset=US-ASCII Markus Heller wrote: >Erik Iverson writes: >>> >>> I assumed I had to switch to the maint branch in order to get the 7.01 >>> release. How could I have done this while staying on the master branch? >> >> Basically, as long as you're on master, you'll always have the latest >> and greatest, which may or may not be what you want. >I am confused now. Carsten said is his announcement that master did NOT >contain the 7.01 release: Okay, maybe these pictures will clarify: Org mode is developed in a branch called "master". All new changes are done here so with A, B, C etc. representing changes to Org mode's source code the development looks like this: ,---- | +---+ +---+ +---+ +---+ +---+ +---+ +---+ | [master] | A |--->| B |--->| C |--->| D |--->| E |--->| F |--->| G |---> | +---+ +---+ +---+ +---+ +---+ +---+ +---+ `---- Now let's say at the source code being at patch B the stable version 7.01 is released. In this case we create a new branch called "maint" that starts at patch B: ,---- | +---+ +---+ +---+ +---+ +---+ +---+ +---+ | [master] | A |--->| B |--->| C |--->| D |--->| E |--->| F |--->| G |---> ... | +---+ +---+ +---+ +---+ +---+ +---+ +---+ | : | : | +---+ | [maint] | B | | +---+ `---- Currently "release is on maint" means that the branch [maint] represents the state of Org mode's sources at the time when the release 7.01 was made. Example: Org 7.01 was released after commit (change) a760c250a5585656567275c743cced6c4e652573. The branch [maint] currently contains the source code as it was right after this change.[1] The branch [master] was at this point in time in the same state but has already proceeded with fresh new patches. So, 7.01 is indeed /not/ on master, because master is where all new things go in and has already proceeded (patch C, D etc. in the picture). And [maint] will never be merged to [master], because all changes will be done in [master]. It's the other way round: If a bug is fixed in [master] that is known to be present in [maint], the fix will be first made in [master] and than in [maint]. So if E is a fix for a bug that is present before B (read: in [master] and [maint]), we apply the fix in [maint], too. ,---- | +---+ +---+ +---+ +---+ +---+ +---+ +---+ | | A |--->| B |--->| C |--->| D |--->| E |--->| F |--->| G |---> ... | +---+ +---+ +---+ +---+ +---+ +---+ +---+ | : : | : v | +---+ +---+ | | B |----------------------| E'|---> | +---+ +---+ `---- If people use a stable version (e.g. Release 7.01) we can provide fixes for bugs in this version. More details on this topic especially for Git can be found in: The Git Community Book http://book.git-scm.com/ -or- Loeliger, Jon: Version Control with Git. O'Reilly 2009. (my favorite) HTH, -- David -- OpenPGP... 0x99ADB83B5A4478E6 Jabber.... dmjena@jabber.org Email..... dmaus@ictsoc.de --pgp-sign-Multipart_Mon_Jul_19_21:27:00_2010-1 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iF4EABEIAAYFAkxEpwQACgkQma24O1pEeOaplwEAgUAtH5Xop6eYjB7OrT8rMbFw IHhy8vrl17BHUcwsSW8A/AsDiHyTIFAaN0tHaqA8stPte9cSiBvwTkCmBblVgqli =Ht9q -----END PGP SIGNATURE----- --pgp-sign-Multipart_Mon_Jul_19_21:27:00_2010-1-- --===============0328333666== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --===============0328333666==--