RE: [Orgmode] Re: Org-mode release 7.01
Love the new capture! Thank you, Carsten and other contributors for continuing to making my working life better. Best regards, --Colin Fraizer Indianapolis, IN, USA(, Earth) -Original Message- From: emacs-orgmode-bounces+orgmode=cfraizer@gnu.org [mailto:emacs-orgmode-bounces+orgmode=cfraizer@gnu.org] On Behalf Of Matt Lundin Sent: Monday, July 19, 2010 8:48 AM To: Carsten Dominik Cc: emacs-orgmode Mailinglist Subject: [Orgmode] Re: Org-mode release 7.01 Carsten Dominik carsten.domi...@gmail.com writes: This is a major release, and we have worked months on getting it together. Most important is of cause the complete integration of Org Babel into Org mode. Many thanks to Eric Schulte and Dan Davison who have worked tirelessly to make this happen. Thomas S. Dye gets credit here as well because he did a lot of work on documentation and function/variable docstrings. Thanks, Carsten, for another brilliant release! And a special thanks to Eric Schulte for taking into account my concerns about security and org-babel and for finding a very graceful solution. Best, Matt ___ 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 ___ 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
[Orgmode] Re: Org-mode release 7.01
David Maus dm...@ictsoc.de writes: Markus Heller wrote: Erik Iverson er...@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: The only thing in maint that is not in master is the change of the version number in the sources. You won't find the commit that sets the version number to 7.01 on the master branch but all of the other interesting changes are there. 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. It's actually easier to apply a fix that is intended to go in both master and maint on a topic branch for the bugfix that is rooted at a commit common to both maint and master (your [B] on the master branch, A in the description below) and then merge that commit into both master and maint since you only have to create the commit once. o -- o -- A -- o -- o -- o -- C master \ Bmaint Create the fix (F) at A o -- o -- A -- o -- o -- o -- C master |\ | Bmaint | F bugfix and merge the fix into maint o -- o -- A -- o -- o -- o -- C master |\ | B -- M maint | / F/ bugfix and into master o -- o -- A -- o -- o -- o -- C -- D master |\ / | B -- M /maint | / / F/ / bugfix \ / \/ -Bernt ___ 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
[Orgmode] Re: Org-mode release 7.01
Carsten Dominik carsten.domi...@gmail.com writes: This is a major release, and we have worked months on getting it together. Most important is of cause the complete integration of Org Babel into Org mode. Many thanks to Eric Schulte and Dan Davison who have worked tirelessly to make this happen. Thomas S. Dye gets credit here as well because he did a lot of work on documentation and function/variable docstrings. Thanks, Carsten, for another brilliant release! And a special thanks to Eric Schulte for taking into account my concerns about security and org-babel and for finding a very graceful solution. Best, Matt ___ 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
[Orgmode] Re: Org-mode release 7.01
Carsten Dominik carsten.domi...@gmail.com writes: [snip] Thanks, thanks, thanks! Enjoy! - Carsten P.S. If you are trying to find the 7.01 release on the master branch in the repository, you will not. The releases are now on a new branch, called maint, which will contain only commits that are also releases. This will make it easier to make minor fixes to a release while development continues on the master branch. This might be a bit OT, I apoligize, but how exactly do I get the new release with git? I'm new to git, and I've tried the following: 1. Change the branch to maint 2. git pull git://repo.or.cz/org-mode.git maint All I get is a list of Merge conflicts from the Auto-merging as shown below. I must be doing something wrong, it'd be great if one of the git wizards could help me out :-) Thanks and cheers, and tons of thanks to Carsten and all contributors!! Markus The merge conflicts I get: From git://repo.or.cz/org-mode * branchmaint - FETCH_HEAD Auto-merging ORGWEBPAGE/index.org Auto-merging README_DIST CONFLICT (content): Merge conflict in README_DIST Auto-merging doc/org.texi CONFLICT (content): Merge conflict in doc/org.texi Auto-merging doc/orgcard.tex CONFLICT (content): Merge conflict in doc/orgcard.tex Auto-merging lisp/ob-C.el CONFLICT (content): Merge conflict in lisp/ob-C.el Auto-merging lisp/ob-R.el CONFLICT (content): Merge conflict in lisp/ob-R.el Auto-merging lisp/ob-asymptote.el CONFLICT (content): Merge conflict in lisp/ob-asymptote.el Auto-merging lisp/ob-clojure.el CONFLICT (content): Merge conflict in lisp/ob-clojure.el Auto-merging lisp/ob-comint.el CONFLICT (content): Merge conflict in lisp/ob-comint.el Auto-merging lisp/ob-css.el CONFLICT (content): Merge conflict in lisp/ob-css.el Auto-merging lisp/ob-ditaa.el CONFLICT (content): Merge conflict in lisp/ob-ditaa.el Auto-merging lisp/ob-dot.el CONFLICT (content): Merge conflict in lisp/ob-dot.el Auto-merging lisp/ob-emacs-lisp.el CONFLICT (content): Merge conflict in lisp/ob-emacs-lisp.el Auto-merging lisp/ob-eval.el CONFLICT (content): Merge conflict in lisp/ob-eval.el Auto-merging lisp/ob-exp.el CONFLICT (content): Merge conflict in lisp/ob-exp.el Auto-merging lisp/ob-gnuplot.el CONFLICT (content): Merge conflict in lisp/ob-gnuplot.el Auto-merging lisp/ob-haskell.el CONFLICT (content): Merge conflict in lisp/ob-haskell.el Auto-merging lisp/ob-keys.el CONFLICT (content): Merge conflict in lisp/ob-keys.el Auto-merging lisp/ob-latex.el CONFLICT (content): Merge conflict in lisp/ob-latex.el Auto-merging lisp/ob-lob.el CONFLICT (content): Merge conflict in lisp/ob-lob.el Auto-merging lisp/ob-matlab.el CONFLICT (content): Merge conflict in lisp/ob-matlab.el Auto-merging lisp/ob-mscgen.el CONFLICT (content): Merge conflict in lisp/ob-mscgen.el Auto-merging lisp/ob-ocaml.el CONFLICT (content): Merge conflict in lisp/ob-ocaml.el Auto-merging lisp/ob-octave.el CONFLICT (content): Merge conflict in lisp/ob-octave.el Auto-merging lisp/ob-perl.el CONFLICT (content): Merge conflict in lisp/ob-perl.el Auto-merging lisp/ob-python.el CONFLICT (content): Merge conflict in lisp/ob-python.el Auto-merging lisp/ob-ref.el CONFLICT (content): Merge conflict in lisp/ob-ref.el Auto-merging lisp/ob-ruby.el CONFLICT (content): Merge conflict in lisp/ob-ruby.el Auto-merging lisp/ob-sass.el CONFLICT (content): Merge conflict in lisp/ob-sass.el Auto-merging lisp/ob-screen.el CONFLICT (content): Merge conflict in lisp/ob-screen.el Auto-merging lisp/ob-sh.el CONFLICT (content): Merge conflict in lisp/ob-sh.el Auto-merging lisp/ob-sql.el CONFLICT (content): Merge conflict in lisp/ob-sql.el Auto-merging lisp/ob-sqlite.el CONFLICT (content): Merge conflict in lisp/ob-sqlite.el Auto-merging lisp/ob-table.el CONFLICT (content): Merge conflict in lisp/ob-table.el Auto-merging lisp/ob-tangle.el CONFLICT (content): Merge conflict in lisp/ob-tangle.el Auto-merging lisp/ob.el CONFLICT (content): Merge conflict in lisp/ob.el Auto-merging lisp/org-agenda.el CONFLICT (content): Merge conflict in lisp/org-agenda.el Auto-merging lisp/org-archive.el CONFLICT (content): Merge conflict in lisp/org-archive.el Auto-merging lisp/org-ascii.el CONFLICT (content): Merge conflict in lisp/org-ascii.el Auto-merging lisp/org-attach.el CONFLICT (content): Merge conflict in lisp/org-attach.el Auto-merging lisp/org-bbdb.el CONFLICT (content): Merge conflict in lisp/org-bbdb.el Auto-merging lisp/org-beamer.el CONFLICT (content): Merge conflict in lisp/org-beamer.el Auto-merging lisp/org-bibtex.el CONFLICT (content): Merge conflict in lisp/org-bibtex.el Auto-merging lisp/org-capture.el CONFLICT (content): Merge conflict in lisp/org-capture.el Auto-merging lisp/org-clock.el CONFLICT (content): Merge conflict in lisp/org-clock.el Auto-merging lisp/org-colview-xemacs.el CONFLICT (content): Merge conflict in lisp/org-colview-xemacs.el Auto-merging lisp/org-colview.el CONFLICT (content): Merge conflict in lisp/org-colview.el Auto-merging lisp/org-compat.el
[Orgmode] Re: Org-mode release 7.01
Markus Heller helle...@gmail.com writes: Carsten Dominik carsten.domi...@gmail.com writes: [snip] Thanks, thanks, thanks! Enjoy! - Carsten P.S. If you are trying to find the 7.01 release on the master branch in the repository, you will not. The releases are now on a new branch, called maint, which will contain only commits that are also releases. This will make it easier to make minor fixes to a release while development continues on the master branch. This might be a bit OT, I apoligize, but how exactly do I get the new release with git? I'm new to git, and I've tried the following: 1. Change the branch to maint 2. git pull git://repo.or.cz/org-mode.git maint That command tries to merge maint with the branch you're currently on - most likely main. If you do not have manual changes in your working tree you can run git reset --hard to undo that merge. I think what you want is: git pull git checkout -t origin/maint Andreas All I get is a list of Merge conflicts from the Auto-merging as shown below. I must be doing something wrong, it'd be great if one of the git wizards could help me out :-) Thanks and cheers, and tons of thanks to Carsten and all contributors!! Markus The merge conflicts I get: From git://repo.or.cz/org-mode * branchmaint - FETCH_HEAD Auto-merging ORGWEBPAGE/index.org Auto-merging README_DIST CONFLICT (content): Merge conflict in README_DIST Auto-merging doc/org.texi CONFLICT (content): Merge conflict in doc/org.texi Auto-merging doc/orgcard.tex CONFLICT (content): Merge conflict in doc/orgcard.tex Auto-merging lisp/ob-C.el CONFLICT (content): Merge conflict in lisp/ob-C.el Auto-merging lisp/ob-R.el CONFLICT (content): Merge conflict in lisp/ob-R.el Auto-merging lisp/ob-asymptote.el CONFLICT (content): Merge conflict in lisp/ob-asymptote.el Auto-merging lisp/ob-clojure.el CONFLICT (content): Merge conflict in lisp/ob-clojure.el Auto-merging lisp/ob-comint.el CONFLICT (content): Merge conflict in lisp/ob-comint.el Auto-merging lisp/ob-css.el CONFLICT (content): Merge conflict in lisp/ob-css.el Auto-merging lisp/ob-ditaa.el CONFLICT (content): Merge conflict in lisp/ob-ditaa.el Auto-merging lisp/ob-dot.el CONFLICT (content): Merge conflict in lisp/ob-dot.el Auto-merging lisp/ob-emacs-lisp.el CONFLICT (content): Merge conflict in lisp/ob-emacs-lisp.el Auto-merging lisp/ob-eval.el CONFLICT (content): Merge conflict in lisp/ob-eval.el Auto-merging lisp/ob-exp.el CONFLICT (content): Merge conflict in lisp/ob-exp.el Auto-merging lisp/ob-gnuplot.el CONFLICT (content): Merge conflict in lisp/ob-gnuplot.el Auto-merging lisp/ob-haskell.el CONFLICT (content): Merge conflict in lisp/ob-haskell.el Auto-merging lisp/ob-keys.el CONFLICT (content): Merge conflict in lisp/ob-keys.el Auto-merging lisp/ob-latex.el CONFLICT (content): Merge conflict in lisp/ob-latex.el Auto-merging lisp/ob-lob.el CONFLICT (content): Merge conflict in lisp/ob-lob.el Auto-merging lisp/ob-matlab.el CONFLICT (content): Merge conflict in lisp/ob-matlab.el Auto-merging lisp/ob-mscgen.el CONFLICT (content): Merge conflict in lisp/ob-mscgen.el Auto-merging lisp/ob-ocaml.el CONFLICT (content): Merge conflict in lisp/ob-ocaml.el Auto-merging lisp/ob-octave.el CONFLICT (content): Merge conflict in lisp/ob-octave.el Auto-merging lisp/ob-perl.el CONFLICT (content): Merge conflict in lisp/ob-perl.el Auto-merging lisp/ob-python.el CONFLICT (content): Merge conflict in lisp/ob-python.el Auto-merging lisp/ob-ref.el CONFLICT (content): Merge conflict in lisp/ob-ref.el Auto-merging lisp/ob-ruby.el CONFLICT (content): Merge conflict in lisp/ob-ruby.el Auto-merging lisp/ob-sass.el CONFLICT (content): Merge conflict in lisp/ob-sass.el Auto-merging lisp/ob-screen.el CONFLICT (content): Merge conflict in lisp/ob-screen.el Auto-merging lisp/ob-sh.el CONFLICT (content): Merge conflict in lisp/ob-sh.el Auto-merging lisp/ob-sql.el CONFLICT (content): Merge conflict in lisp/ob-sql.el Auto-merging lisp/ob-sqlite.el CONFLICT (content): Merge conflict in lisp/ob-sqlite.el Auto-merging lisp/ob-table.el CONFLICT (content): Merge conflict in lisp/ob-table.el Auto-merging lisp/ob-tangle.el CONFLICT (content): Merge conflict in lisp/ob-tangle.el Auto-merging lisp/ob.el CONFLICT (content): Merge conflict in lisp/ob.el Auto-merging lisp/org-agenda.el CONFLICT (content): Merge conflict in lisp/org-agenda.el Auto-merging lisp/org-archive.el CONFLICT (content): Merge conflict in lisp/org-archive.el Auto-merging lisp/org-ascii.el CONFLICT (content): Merge conflict in lisp/org-ascii.el Auto-merging lisp/org-attach.el CONFLICT (content): Merge conflict in lisp/org-attach.el Auto-merging lisp/org-bbdb.el CONFLICT (content): Merge conflict in lisp/org-bbdb.el Auto-merging lisp/org-beamer.el CONFLICT (content): Merge conflict in lisp/org-beamer.el Auto-merging lisp/org-bibtex.el CONFLICT (content): Merge conflict in
[Orgmode] Re: Org-mode release 7.01
Andreas Burtzlaff and...@gmx.net writes: Markus Heller helle...@gmail.com writes: Carsten Dominik carsten.domi...@gmail.com writes: [snip] Thanks, thanks, thanks! Enjoy! - Carsten P.S. If you are trying to find the 7.01 release on the master branch in the repository, you will not. The releases are now on a new branch, called maint, which will contain only commits that are also releases. This will make it easier to make minor fixes to a release while development continues on the master branch. This might be a bit OT, I apoligize, but how exactly do I get the new release with git? I'm new to git, and I've tried the following: 1. Change the branch to maint 2. git pull git://repo.or.cz/org-mode.git maint That command tries to merge maint with the branch you're currently on - most likely main. If you do not have manual changes in your working tree you can run git reset --hard to undo that merge. I think what you want is: git pull git checkout -t origin/maint Andreas, thanks for the reply, worked as advertised. Cheers Markus ___ 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
[Orgmode] Re: Org-mode release 7.01
Markus Heller helle...@gmail.com writes: Andreas Burtzlaff and...@gmx.net writes: Markus Heller helle...@gmail.com writes: Carsten Dominik carsten.domi...@gmail.com writes: [snip] Thanks, thanks, thanks! Enjoy! - Carsten P.S. If you are trying to find the 7.01 release on the master branch in the repository, you will not. The releases are now on a new branch, called maint, which will contain only commits that are also releases. This will make it easier to make minor fixes to a release while development continues on the master branch. This might be a bit OT, I apoligize, but how exactly do I get the new release with git? I'm new to git, and I've tried the following: 1. Change the branch to maint 2. git pull git://repo.or.cz/org-mode.git maint That command tries to merge maint with the branch you're currently on - most likely main. If you do not have manual changes in your working tree you can run git reset --hard to undo that merge. I think what you want is: git pull git checkout -t origin/maint Andreas, thanks for the reply, worked as advertised. Cheers Markus Great, but thinking about it again, it is not necessary to switch to the maint branch unless you want to stick to releases and not follow the bleeding edge of development. Andreas ___ 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 Andreas ___ 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
[Orgmode] Re: Org-mode release 7.01
Andreas Burtzlaff and...@gmx.net writes: Markus Heller helle...@gmail.com writes: Andreas Burtzlaff and...@gmx.net writes: Markus Heller helle...@gmail.com writes: Carsten Dominik carsten.domi...@gmail.com writes: [snip] Thanks, thanks, thanks! Enjoy! - Carsten P.S. If you are trying to find the 7.01 release on the master branch in the repository, you will not. The releases are now on a new branch, called maint, which will contain only commits that are also releases. This will make it easier to make minor fixes to a release while development continues on the master branch. This might be a bit OT, I apoligize, but how exactly do I get the new release with git? I'm new to git, and I've tried the following: 1. Change the branch to maint 2. git pull git://repo.or.cz/org-mode.git maint That command tries to merge maint with the branch you're currently on - most likely main. If you do not have manual changes in your working tree you can run git reset --hard to undo that merge. I think what you want is: git pull git checkout -t origin/maint Andreas, thanks for the reply, worked as advertised. Cheers Markus Great, but thinking about it again, it is not necessary to switch to the maint branch unless you want to stick to releases and not follow the bleeding edge of development. 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? Thanks Markus ___ 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
Re: [Orgmode] Re: Org-mode release 7.01
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. At certain times, including in the past few days, 'master' is deemed release-worthy, and a stable release is produced. However, development goes on in the master branch. The maint branch was created so that small bugs in the latest release could be fixed and updated, without having to include whatever major developments might have happened on master in the mean time. ___ 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
Re: [Orgmode] Re: Org-mode release 7.01
On Jul 19, 2010, at 8:38 PM, Erik Iverson wrote: 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. At certain times, including in the past few days, 'master' is deemed release-worthy, and a stable release is produced. However, development goes on in the master branch. The maint branch was created so that small bugs in the latest release could be fixed and updated, without having to include whatever major developments might have happened on master in the mean time. The main reason for making releases at all are - to produce a fall-back if the current master does not work for you because it is buggy. This happen only rarely here and only for short times. - To give alternative distributions like the Debian package a point of reference, a signal that this state of Org is reasonably well tested and stable. Kind regards - Carsten ___ 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
[Orgmode] Re: Org-mode release 7.01
Erik Iverson er...@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: quote P.S. If you are trying to find the 7.01 release on the master branch in the repository, you will not. The releases are now on a new branch, called maint, which will contain only commits that are also releases. This will make it easier to make minor fixes to a release while development continues on the master branch. /quote At certain times, including in the past few days, 'master' is deemed release-worthy, and a stable release is produced. However, development goes on in the master branch. The maint branch was created so that small bugs in the latest release could be fixed and updated, without having to include whatever major developments might have happened on master in the mean time. Would this explanation be correct then: Right now, 7.01 is in the maint branch, for a few days/weeks or so, until the small nags have been resolved; the master branch is the last 6.36 release. Once the little bugs/issues have been resolved, 7.01 will be merged with the master branch, and everything will be back to (my) normal? Is this correct? Thanks Markus ___ 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
Re: [Orgmode] Re: Org-mode release 7.01
Markus Heller wrote: Erik Iverson er...@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 dmj...@jabber.org Email. dm...@ictsoc.de pgpLIbM58wIHQ.pgp Description: PGP signature ___ 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
