Check If a Merge Modified Any Files

Jensen, Aaron ajensen at webmd.net
Fri Aug 17 00:57:22 UTC 2012


> What you're asking is really if there is a command that will compare
>
>   hg manifest --debug -r "M"
>
> with
> 
>   hg manifest --debug -r "p1(M)"
> 
> and
> 
>   hg manifest --debug -r "p2(M)"
> 
> and detertime if the file IDs in the merge manifest are present in either of the two parent 
> manifests. That is, if each file in the merge is unchanged compared to one of the two 
> parents.

I accidentally stumbled on an answer trying to implement this suggestion.  I discovered that the files templating keyword contains the information I need.  For merges where there aren't any new changes introduced, {files} returns an empty list.  Otherwise, it contains the list of files modified.  

I also noticed that the changelog template style shows the output in the way I need.

     <:> Aaron





More information about the Mercurial mailing list