hg resolve using internal:other with wildcards

[Ike Casteleyn]

Hi,

I did not know that.
However I still found it too complex for this situation
Or to better phrase it, I suspected that there is an simpler way

hg resolve -t=internal:other glob:"c:\sourcecode\...\**\AssemblyInfo.cs"

So basically adding "glob:" makes it expand the wildcards.

Thanks.
Best regards,
Ike

> Date: Mon, 11 Feb 2013 22:15:52 +0100
> From: diptongo at gmail.com
> To: icasteleyn at hotmail.com
> CC: mercurial at selenic.com
> Subject: Re: hg resolve using internal:other with wildcards
> 
> Replying Ike Casteleyn:
> > Hi,
> >
> > That would be to always use internal:other when merging.  This is a
> > one time only thing I want to achieve.
> 
> You can alter the config from the command line too:
> 
>     hg --config 'merge-patterns.**/AssemblyInfo.cs=internal:other' resolve ...
> 
> -- 
> Isaac Jurado
> 
> "The noblest pleasure is the joy of understanding."
>                                   Leonardo da Vinci
 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20130211/d8af2a48/attachment-0002.html>