Mercurial > hg

diff tests/test-phases-exchange.t @ 44545:bd7b2c8d06cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: add `--confirm` flag to confirm before writing changes This introduces a new flag to pull command `--confirm` and also a config option named `pull.confirm` which if used will prompt user describing changes which are pulled and asking whether to accept them or not. Differential Revision: https://phab.mercurial-scm.org/D8200
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 29 Feb 2020 12:58:38 +0530
parents 33d30fb1e4ae
children e0dbfbd4062c
line wrap: on
line diff
--- a/tests/test-phases-exchange.t	Sat Feb 29 12:58:13 2020 +0530
+++ b/tests/test-phases-exchange.t	Sat Feb 29 12:58:38 2020 +0530
@@ -326,12 +326,18 @@
   o  0 public a-A - 054250a37db4
   
   $ cd ../mu
-  $ hg pull ../nu
+  $ hg pull ../nu --confirm --config ui.interactive=True<<EOF
+  > y
+  > EOF
   pulling from ../nu
   searching for changes
   adding changesets
   adding manifests
   adding file changes
+  adding 2 changesets with 2 changes to 2 files
+  new changesets d6bcb4f74035:145e75495359 (2 drafts)
+  4 local changesets will be published
+  accept incoming changes (yn)? y
   added 2 changesets with 2 changes to 2 files
   new changesets d6bcb4f74035:145e75495359 (2 drafts)
   4 local changesets published