Making mq use git-style patches (was Re: Issues using mq on large projects)

[Thomas Arendsen Hein]

* L. David Baron <dbaron at dbaron.org> [20070305 02:11]:
> On Sunday 2007-03-04 15:35 -0600, Matt Mackall wrote:
> > One sets all diffs to use git-style patches, the other sets only
> > qrefresh to use them.
> 
> For what it's worth, using
> 
> [defaults]
> qrefresh = --git
> 
> also has the disadvantage that "hg qnew -f" doesn't use --git (using
> 0.9.3).
> 
> Perhaps hg qnew -f should invoke qrefresh with its default options
> to avoid this inconsistency?

The [defaults] section is applied directly to the command line
(nothing else) and qnew doesn't use the command line for calling
qrefresh.

But you can add "qnew = --git", to make qnew use --git flag, too.
The options given in [defaults] are added to every command line use,
so -f doesn't override --git.

For a better solution see
http://www.selenic.com/mercurial/bts/issue491
"new option [diff] git = foo (with foo out of yes/no/warn/auto). Where 'warn'
prints a warning when permissions/copies would be discarded and 'auto' uses git
format if needed."

Thomas

-- 
thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Osnabrück - Registereintrag: Amtsgericht Osnabrück, HR B 18998
Geschäftsführer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.selenic.com/pipermail/mercurial/attachments/20070305/ee257439/attachment.pgp