changeset 972:1f9c8d7f3a12

Merge branch Indore-2017.1.x
author Dmitry Neverov <dmitry.neverov@gmail.com>
date Thu, 22 Jun 2017 12:55:21 +0200
parents ea15ebd45ba4 (current diff) c5dc2c802e4b (diff)
children 81dc5c6fdb25
files
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/python/load-commands-command.py	Tue Jun 13 11:01:29 2017 +0200
+++ b/mercurial-common/src/python/load-commands-command.py	Thu Jun 22 12:55:21 2017 +0200
@@ -52,5 +52,5 @@
 commands.norepo += " CMD"
 
 testedwith = '2.2.2'
-buglink = "@jonnyzzz"
+buglink = "upsource-support@jetbrains.com"
 
--- a/mercurial-common/src/python/load-substates-command.py	Tue Jun 13 11:01:29 2017 +0200
+++ b/mercurial-common/src/python/load-substates-command.py	Thu Jun 22 12:55:21 2017 +0200
@@ -143,6 +143,10 @@
     "load-substates": (load_substates_command, [ ], " [options] OUTPUT_FILE")
 }
 
-testedwith = '2.2.2'
-buglink = "@jonnyzzz"
+load_substates_command.norepo = False
+load_substates_command.optionalrepo = False
+load_substates_command.inferrepo = False
 
+testedwith = '4.2.1'
+buglink = "upsource-support@jetbrains.com"
+