[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: some bzrmerge.el questions
From: |
Glenn Morris |
Subject: |
Re: some bzrmerge.el questions |
Date: |
Sat, 15 Jan 2011 15:44:34 -0500 |
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Stefan Monnier wrote:
> BTW, I also committed a change to smerge, which I used to automate
> most of the conflict resolution (there was tons of spurious
> conflicts with the copyright year update, as you must know, and most
> of them could be resolved automatically).
Well, that would certainly make anyone who resolved them all by hand
look foolish...
Could you add a similar thing for changes in comments that only relate
to loaddef checksums? I think in such cases, it should not bother
merging the change.
>> BTW, the ChangeLog piece often includes too much - see the corrections
>> I just installed. Sometimes it duplicates existing items, often it
>> includes one line too many.
>
> Sounds like a bug in change-log-resolve-conflict.
Of course, I haven't seen it happen again since.
- some bzrmerge.el questions, Glenn Morris, 2011/01/13
- Re: some bzrmerge.el questions, Glenn Morris, 2011/01/14
- Re: some bzrmerge.el questions, Stefan Monnier, 2011/01/14
- Re: some bzrmerge.el questions,
Glenn Morris <=
- Re: some bzrmerge.el questions, Stefan Monnier, 2011/01/15
- Re: some bzrmerge.el questions, martin rudalics, 2011/01/17
- Re: some bzrmerge.el questions, Stefan Monnier, 2011/01/17
- Re: some bzrmerge.el questions, Glenn Morris, 2011/01/17
- Re: some bzrmerge.el questions, Stefan Monnier, 2011/01/18
- Re: some bzrmerge.el questions, Glenn Morris, 2011/01/18