[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: where to push simple bugfix
|
From: |
Jordi Gutiérrez Hermoso |
|
Subject: |
Re: where to push simple bugfix |
|
Date: |
Mon, 6 Aug 2012 11:09:22 -0400 |
On 6 August 2012 10:56, John W. Eaton <address@hidden> wrote:
> On 6-Aug-2012, Jordi Gutiérrez Hermoso wrote:
>
> | The source code reorganisation is no trouble for merges. Hg tracks
> | file renames (unlike a well-known competitor), so files moving around
> | cause no great hassle.
> |
> | Or they shouldn't...
>
> Changes to the renamed files should not cause too much trouble.
> Changes to files like configure.ac or any other file that lists the
> names of the files could easily result in conflicts since there are
> now large sections where the context will not match.
Right, but there haven't been any changes to configure.ac on stable
since the last release.
Matter of fact, I'm back on my dev machine (~, sweet ~), and I just
tried to apply the patch Carlo was talking about. It merges trivially
onto default.
- Jordi G. H.