[PATCH] help: move part of hgrc.5.txt to help/config.txt (issue2804)

Matt Mackall mpm at selenic.com
Fri May 27 08:02:43 CDT 2011


On Fri, 2011-05-27 at 10:18 +0200, Martin Geisler wrote:
> Matt Mackall <mpm at selenic.com> writes:
> 
> > On Thu, 2011-05-26 at 22:28 +0800, Yun Lee wrote:
> >> # HG changeset patch
> >> # User Yun Lee <yun.lee.bj at gmail.com>
> >> # Date 1306420082 -28800
> >> # Branch stable
> >
> > This should probably be done on the default branch. While we generally
> > want doc fixes to go on the stable branch, this is significantly more
> > than a fix.
> >
> > Also, this patch doesn't apply on the default branch because we've
> > touched this file a couple times there. As your patch doesn't flag
> > this as a copy (you'll need to do hg cp, then use the --git format),
> > we'd potentially miss those changes in a merge from stable to default
> > rather than getting them automatically merged.
> 
> Since neither file (doc/hgrc.5.txt or mercurial/help/config.txt) is
> remove here, we wont be able to automatically merge in changes made to
> hgrc.5.txt into config.txt.

Yep, I forgot we had a destination file.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list