hg resolve using internal:other with wildcards

[Ike Casteleyn]

Hi,

That would be to always use internal:other when merging.
This is a one time only thing I want to achieve.

Best regards,
Ike

> Date: Mon, 11 Feb 2013 21:13:22 +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:
> > Hi,
> >
> > I want to resolve all "AssemblyInfo.cs" in my workingfolder (doesn't
> > matter how many subdirectories deep) using internal:other However I
> > can't seem to be able to figure out the command-line.
> > 
> > I have tried
> > hg resolve -t=internal:other AssemblyInfo.cs
> > hg resolve -t=internal:other **/AssemblyInfo.cs
> > hg resolve -t=internal:other -I AssemblyInfo.cs
> > hg resolve -t=internal:other -I **/AssemblyInfo.cs
> > 
> > also tried with the full path
> > hg resolve -t=internal:other -I c:\sourcecode\myrespo\**\AssemblyInfo.cs
> > 
> > I'm probably missing something obvious, but I don't see it.
> > Any ideas?
> 
> A merge pattern should work for your case:
> 
>     http://www.selenic.com/hg/help/hgrc  (look for merge-patterns)
> 
> In brief, you should edit your ~/.hgrc or your repository's .hg/hgrc to
> add the following:
> 
>     [merge-patterns]
>     **/AssemblyInfo.cs = internal:other
> 
> I'm not sure if that glob would work for AssemblyInfo.cs at the
> repository root, though.
> 
> -- 
> 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/36c4730f/attachment-0002.html>