Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w

Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w

[Eli Zaretskii]

> 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.

Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w

[Stephen J. Turnbull]

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.

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]

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!) :)

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]

[Eli Zaretskii]

> 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.

Re: marking commits not to be merged after the fact

[Glenn Morris]

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.