Mercurial > hg

diff tests/test-strip.t @ 42470:1acaa9f37377

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip: during merge allow strip only when -f is used This ensures to abort strip to `hg strip` when we have a merge in progress and allow it only when a `--force` flag is used. Differential Revision: https://phab.mercurial-scm.org/D6529
author Taapas Agrawal <taapas2897@gmail.com>
date Fri, 14 Jun 2019 18:25:14 +0530
parents 943248e47864
children 1474f5d84662
line wrap: on
line diff
--- a/tests/test-strip.t	Fri Apr 26 00:48:12 2019 +0200
+++ b/tests/test-strip.t	Fri Jun 14 18:25:14 2019 +0530
@@ -272,7 +272,12 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     c
   
+##strip not allowed with merge in progress
   $ hg strip 4
+  abort: outstanding uncommitted merge
+  [255]
+##strip allowed --force with merge in progress
+  $ hg strip 4 --force
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)