Mercurial > hg-stable

changeset 32383:864fc285d10a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib: make editmergeps able to work with Windows GUI editors Using Start-Process -Wait makes it wait until the process finishes, which is necesssary for Windows GUI applications. My short testing also demonstrated that it does not hurt with command line vim.
author Kostia Balytskyi <ikostia@fb.com>
date Fri, 19 May 2017 17:00:55 -0700
parents d47d7d3bd07b
children a438f5a3bc09
files contrib/editmergeps.ps1
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/editmergeps.ps1	Sat Jan 09 23:24:52 2016 +0900
+++ b/contrib/editmergeps.ps1	Fri May 19 17:00:55 2017 -0700
@@ -46,7 +46,7 @@
   # or the user stops editing the file
   while (($firstline -ne $nil) -and ($firstline -ne $previousline))
   {
-    & "$ed" "+$firstline" "$file"
+    Start-Process -Wait $ed $linearg,$file
     $previousline = $firstline
     $lines = Get-Lines
     $firstline = if ($lines.Length -gt 0) { $lines[0] } else { $nil }