Patchwork [1,of,2] tests: test that push doesn’t complain about unstable changesets if no changes

login
register
mail settings
Submitter Manuel Jacob
Date July 17, 2020, 6:27 a.m.
Message ID <55626b2da7d55766ae66.1594967246@tmp>
Download mbox | patch
Permalink /patch/46773/
State New
Headers show

Comments

Manuel Jacob - July 17, 2020, 6:27 a.m.
# HG changeset patch
# User Manuel Jacob <me@manueljacob.de>
# Date 1594965560 -7200
#      Fri Jul 17 07:59:20 2020 +0200
# Node ID 55626b2da7d55766ae667d91652d094c0c4aa86f
# Parent  f55099982bc517c349bf46fab53b8696f0615c17
# EXP-Topic issue6372
tests: test that push doesn’t complain about unstable changesets if no changes

When there’re no outgoing changes, push doesn’t complain about unstable
changesets.

There is currently a bug (see issue6372) that causes that there is an abort on
push when the outgoing changes contain another changeset even if that is not
obsolete or unstable. A test case and fix for that is sent in the next patch.

Patch

diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -627,6 +627,26 @@ 
   abort: push includes orphan changeset: cda648ca50f5!
   [255]
 
+with --force it will work anyway
+
+  $ hg push ../tmpc/ --force
+  pushing to ../tmpc/
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files
+  1 new obsolescence markers
+  1 new orphan changesets
+
+if the orphan changeset is already on the server, pushing should work
+
+  $ hg push ../tmpc/
+  pushing to ../tmpc/
+  searching for changes
+  no changes found
+  [1]
+
 Test that extinct changeset are properly detected
 
   $ hg log -r 'extinct()'