[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: marking commits not to be merged after the fact [was Re: bug#8047: 2
|
From: |
Eli Zaretskii |
|
Subject: |
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] |
|
Date: |
Sat, 19 Feb 2011 22:52:57 +0200 |
> From: Glenn Morris <address@hidden>
> Cc: address@hidden, address@hidden, address@hidden
> 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.