* Committing to both branches
@ 2010-06-01 2:28 Stefan Monnier
2010-06-01 8:19 ` Juanma Barranquero
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Monnier @ 2010-06-01 2:28 UTC (permalink / raw)
To: emacs-devel
Can people *please* stop committing to both emacs-23 and trunk branches?
Just pick one.
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Committing to both branches 2010-06-01 2:28 Committing to both branches Stefan Monnier @ 2010-06-01 8:19 ` Juanma Barranquero 2010-06-01 8:33 ` David Kastrup 2010-06-01 13:12 ` Stefan Monnier 0 siblings, 2 replies; 4+ messages in thread From: Juanma Barranquero @ 2010-06-01 8:19 UTC (permalink / raw) To: Stefan Monnier; +Cc: emacs-devel > Can people *please* stop committing to both emacs-23 and trunk branches? Not even with "Backport from trunk" in the summary? Juanma ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Committing to both branches 2010-06-01 8:19 ` Juanma Barranquero @ 2010-06-01 8:33 ` David Kastrup 2010-06-01 13:12 ` Stefan Monnier 1 sibling, 0 replies; 4+ messages in thread From: David Kastrup @ 2010-06-01 8:33 UTC (permalink / raw) To: emacs-devel Juanma Barranquero <lekktu@gmail.com> writes: >> Can people *please* stop committing to both emacs-23 and trunk branches? > > Not even with "Backport from trunk" in the summary? Independent commits will likely cause merge conflicts. -- David Kastrup ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Committing to both branches 2010-06-01 8:19 ` Juanma Barranquero 2010-06-01 8:33 ` David Kastrup @ 2010-06-01 13:12 ` Stefan Monnier 1 sibling, 0 replies; 4+ messages in thread From: Stefan Monnier @ 2010-06-01 13:12 UTC (permalink / raw) To: Juanma Barranquero; +Cc: emacs-devel >> Can people *please* stop committing to both emacs-23 and trunk branches? > Not even with "Backport from trunk" in the summary? A backport is something else: it's when you first committed to trunk and later decide that it would also make sense to install it on emacs-23. "Committing to both" refers to commits done pretty much at the same time. These are a waste of time for the committers and for the subsequent merger (myself). I.e. a "lose-lose". Stefan ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-06-01 13:12 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-06-01 2:28 Committing to both branches Stefan Monnier 2010-06-01 8:19 ` Juanma Barranquero 2010-06-01 8:33 ` David Kastrup 2010-06-01 13:12 ` Stefan Monnier
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/emacs.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).