##// END OF EJS Templates
subrepo: Turn off interactive mode when merging mercurial repo....
Martin Bornhold -
r99:e1008af8 default
parent child
Show More
@@ -683,6 +683,13 class HgRemote(object):
683 repo = self._factory.repo(wire)
683 repo = self._factory.repo(wire)
684 baseui = self._factory._create_config(wire['config'])
684 baseui = self._factory._create_config(wire['config'])
685 repo.ui.setconfig('ui', 'merge', 'internal:dump')
685 repo.ui.setconfig('ui', 'merge', 'internal:dump')
686
687 # In case of sub repositories are used mercurial prompts the user in
688 # case of merge conflicts or different sub repository sources. By
689 # setting the interactive flag to `False` mercurial doesn't prompt the
690 # used but instead uses a default value.
691 repo.ui.setconfig('ui', 'interactive', False)
692
686 commands.merge(baseui, repo, rev=revision)
693 commands.merge(baseui, repo, rev=revision)
687
694
688 @reraise_safe_exceptions
695 @reraise_safe_exceptions
General Comments 0
You need to be logged in to leave comments. Login now