Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/editmergeps.bat
author Pulkit Goyal <pulkit@yandex-team.ru>
Mon, 27 Aug 2018 14:02:48 +0300
changeset 39357 2b8adb7ca39a
parent 32567 4b9b87930cb3
permissions -rw-r--r--
narrow: update the narrowspecs to new ones after pulling when widening The ellipsis case updates the new narrowspecs at bundle2 handling code, and non-ellipsis widening didn't use to work and never set the new narrowpats. Previous pacth added server side logic for widening without ellipsis. This patch adds the missing repo.setnarrowpats() so that we set the new narrowpats after widening in non-ellipsis cases also. This makes widening with non-ellipsis case work but there are certain things which we can improve. Differential Revision: https://phab.mercurial-scm.org/D4384
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
32329
799615bbf5bf contrib: add editmerge version for powershell
Kostia Balytskyi <ikostia@fb.com>
parents:
diff changeset 
     1
 
@echo off
32567
4b9b87930cb3 contrib: run editmergeps.ps1 from the same location as editmergeps.bat
Kostia Balytskyi <ikostia@fb.com>
parents: 32329
diff changeset 
     2
 
powershell -NoProfile -ExecutionPolicy unrestricted -Command "& '%~dp0\editmergeps.ps1' %*"
Mercurial