hg merge preview

[Christian Ebert]

* Martin Geisler on Wednesday, August 31, 2011 at 15:06:28 +0200
> Not really -- to identify the problems you will have to run (simulate)
> the merge process. So the best you can do is to do it non-interactively
> and then revert back to where you were.
> 
> Start the merge with:
> 
>  $ hg merge --tool internal:merge
> 
> List the status of the merge:
> 
>  $ hg resolve --list
> 
> Abort the merge with:
> 
>  $ hg update -C .
> 
> You can wrap all this into a shell alias:
> 
>  [alias]
>  preview = !$HG -q merge --tool internal:merge $1 &&
>             $HG resolve --list &&
>             $HG -q update -C .

Nice, but it should be:

preview = !$HG -q merge --tool internal:merge $1;
           $HG resolve --list &&
           $HG -q update -C .

Otherwise it aborts after the merge.

c
-- 
theatre - books - texts - movies
Black Trash Productions at home: http://www.blacktrash.org
Black Trash Productions on Facebook:
http://www.facebook.com/blacktrashproductions