From: David Maus <dmaus@ictsoc.de>
To: Markus Heller <hellerm2@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: Re: Org-mode release 7.01
Date: Mon, 19 Jul 2010 21:27:01 +0200 [thread overview]
Message-ID: <87mxtnz30a.wl%dmaus@ictsoc.de> (raw)
In-Reply-To: <0vaapnpaxw.fsf@gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 3224 bytes --]
Markus Heller wrote:
>Erik Iverson <eriki@ccbr.umn.edu> 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
[-- Attachment #1.2: Type: application/pgp-signature, Size: 230 bytes --]
[-- Attachment #2: Type: text/plain, Size: 201 bytes --]
_______________________________________________
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
next prev parent reply other threads:[~2010-07-19 19:27 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-19 6:43 Org-mode release 7.01 Carsten Dominik
2010-07-19 8:22 ` Christian Moe
2010-07-19 10:38 ` Stefan Vollmar
2010-07-19 8:36 ` Eric S Fraga
2010-07-19 17:52 ` Eric Schulte
2010-07-19 12:47 ` Matt Lundin
2010-07-20 7:49 ` Colin Fraizer
2010-07-19 13:47 ` Ista Zahn
2010-07-19 15:48 ` Carsten Dominik
2010-07-19 14:55 ` Manish
2010-07-19 15:31 ` Scott Randby
2010-07-19 15:49 ` Carsten Dominik
2010-07-19 17:15 ` Markus Heller
2010-07-19 17:38 ` Andreas Burtzlaff
2010-07-19 17:46 ` Markus Heller
2010-07-19 18:23 ` Andreas Burtzlaff
2010-07-19 18:33 ` Markus Heller
2010-07-19 18:38 ` Erik Iverson
2010-07-19 18:45 ` Carsten Dominik
2010-07-19 18:45 ` Markus Heller
2010-07-19 19:27 ` David Maus [this message]
2010-07-20 11:37 ` Bernt Hansen
2010-07-19 23:29 ` Sebastian Rose
2010-07-20 13:40 ` Peter Westlake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mxtnz30a.wl%dmaus@ictsoc.de \
--to=dmaus@ictsoc.de \
--cc=emacs-orgmode@gnu.org \
--cc=hellerm2@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).