* Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w
[not found] ` <nzwrkwsngp.fsf@fencepost.gnu.org>
@ 2011-02-19 8:34 ` Eli Zaretskii
2011-02-19 9:31 ` Stephen J. Turnbull
2011-02-19 19:25 ` marking commits not to be merged after the fact [was Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w] Glenn Morris
0 siblings, 2 replies; 5+ messages in thread
From: Eli Zaretskii @ 2011-02-19 8:34 UTC (permalink / raw)
To: Glenn Morris; +Cc: cyd, monnier, emacs-devel
> From: Glenn Morris <rgm@gnu.org>
> Cc: Stefan Monnier <monnier@IRO.UMontreal.CA>, cyd@stupidchicken.com, 8047@debbugs.gnu.org
> Date: Fri, 18 Feb 2011 22:38:30 -0500
>
> If you fix the same thing two different ways at the same time in trunk
> and branch, please try to mark the branch commit with "do not merge to
> trunk".
Yes, I know I should. I even told myself not to forget before typing
the commands, and I still forgot. Sorry.
I wonder if we can invent some way of doing this without relying on
people's memory so much. Or at least have a way of doing something
_after_ the commit to help the merge, if I do forget.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w
2011-02-19 8:34 ` bug#8047: 23.2.94; Auto image mode breaks C-x C-w Eli Zaretskii
@ 2011-02-19 9:31 ` Stephen J. Turnbull
2011-02-19 19:25 ` marking commits not to be merged after the fact [was Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w] Glenn Morris
1 sibling, 0 replies; 5+ messages in thread
From: Stephen J. Turnbull @ 2011-02-19 9:31 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: cyd, monnier, emacs-devel
Eli Zaretskii writes:
> I wonder if we can invent some way of doing this without relying on
> people's memory so much. Or at least have a way of doing something
> _after_ the commit to help the merge, if I do forget.
I think I've suggested this before, but AFAIK svnmerge.py is a good
tool for this, if you're using svn. The Python folks are planning to
port it to Mercurial, so it should also be port-able to Bazaar.
I do not know how much code and/or delicate design is involved (I've
never needed such a tool in my own work), but presumably something
similar could be done in Emacs Lisp if requiring Yet Another 3rd-Party
Tool doesn't float your boat.
^ permalink raw reply [flat|nested] 5+ messages in thread
* marking commits not to be merged after the fact [was Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w]
2011-02-19 8:34 ` bug#8047: 23.2.94; Auto image mode breaks C-x C-w Eli Zaretskii
2011-02-19 9:31 ` Stephen J. Turnbull
@ 2011-02-19 19:25 ` Glenn Morris
2011-02-19 20:52 ` Eli Zaretskii
1 sibling, 1 reply; 5+ messages in thread
From: Glenn Morris @ 2011-02-19 19:25 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: cyd, monnier, emacs-devel
Eli Zaretskii wrote:
> Or at least have a way of doing something _after_ the commit to help
> the merge, if I do forget.
You can add an entry to bzrmerge-skip-regexp that only matches your
commit and no other. :)
I can't think of anything else you can do... except immediately do the
merge yourself (not necessary in this case!) :)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: marking commits not to be merged after the fact [was Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w]
2011-02-19 19:25 ` marking commits not to be merged after the fact [was Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w] Glenn Morris
@ 2011-02-19 20:52 ` Eli Zaretskii
2011-02-19 21:23 ` marking commits not to be merged after the fact Glenn Morris
0 siblings, 1 reply; 5+ messages in thread
From: Eli Zaretskii @ 2011-02-19 20:52 UTC (permalink / raw)
To: Glenn Morris; +Cc: cyd, monnier, emacs-devel
> From: Glenn Morris <rgm@gnu.org>
> Cc: monnier@IRO.UMontreal.CA, cyd@stupidchicken.com, emacs-devel@gnu.org
> Date: Sat, 19 Feb 2011 14:25:46 -0500
>
> I can't think of anything else you can do... except immediately do the
> merge yourself (not necessary in this case!) :)
How about admin/merge-ignore-versions file, where one could put
numbers of versions to not merge? Then admin/bzrmerge.el could look
in that file, in addition to applying bzrmerge-skip-regexp.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: marking commits not to be merged after the fact
2011-02-19 20:52 ` Eli Zaretskii
@ 2011-02-19 21:23 ` Glenn Morris
0 siblings, 0 replies; 5+ messages in thread
From: Glenn Morris @ 2011-02-19 21:23 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: cyd, monnier, emacs-devel
Eli Zaretskii wrote:
> How about admin/merge-ignore-versions file, where one could put
> numbers of versions to not merge? Then admin/bzrmerge.el could look
> in that file, in addition to applying bzrmerge-skip-regexp.
Yes, perhaps. And maybe it could automatically delete revs from that
list if they are earlier than the latest revno it merged up to.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-02-19 21:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <83tyg5vyvr.fsf@gnu.org>
[not found] ` <str5b8hnx3.fsf@fencepost.gnu.org>
[not found] ` <83sjvowrfd.fsf@gnu.org>
[not found] ` <jwvfwrojb7i.fsf-monnier+emacs@gnu.org>
[not found] ` <83pqqrx3pc.fsf@gnu.org>
[not found] ` <83fwrnwxvp.fsf@gnu.org>
[not found] ` <jwv1v37itny.fsf-monnier+emacs@gnu.org>
[not found] ` <83d3mrwuv9.fsf@gnu.org>
[not found] ` <jwvr5b7fnfi.fsf-monnier+emacs@gnu.org>
[not found] ` <838vxfwbqc.fsf@gnu.org>
[not found] ` <83y65dvfqh.fsf@gnu.org>
[not found] ` <jwv1v35uuhw.fsf-monnier+emacs@gnu.org>
[not found] ` <83ei75ust0.fsf@gnu.org>
[not found] ` <nzwrkwsngp.fsf@fencepost.gnu.org>
2011-02-19 8:34 ` bug#8047: 23.2.94; Auto image mode breaks C-x C-w Eli Zaretskii
2011-02-19 9:31 ` Stephen J. Turnbull
2011-02-19 19:25 ` marking commits not to be merged after the fact [was Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w] Glenn Morris
2011-02-19 20:52 ` Eli Zaretskii
2011-02-19 21:23 ` marking commits not to be merged after the fact Glenn Morris
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).