--- a/tests/test-obsolete.t Fri Jul 17 07:59:20 2020 +0200
+++ b/tests/test-obsolete.t Fri Jul 17 08:21:31 2020 +0200
@@ -251,7 +251,8 @@
$ hg push ../tmpa
pushing to ../tmpa
searching for changes
- abort: push includes phase-divergent changeset: 5601fb93a350!
+ abort: push includes unstable changesets:
+ 5601fb93a350 (phase-divergent)
[255]
Fixing "bumped" situation
@@ -616,7 +617,8 @@
$ hg push ../tmpc/ -r 'desc("original_d")'
pushing to ../tmpc/
searching for changes
- abort: push includes obsolete changeset: 94b33453f93b!
+ abort: push includes obsolete changesets:
+ 94b33453f93b
[255]
refuse to push unstable changeset
@@ -624,7 +626,10 @@
$ hg push ../tmpc/
pushing to ../tmpc/
searching for changes
- abort: push includes orphan changeset: cda648ca50f5!
+ abort: push includes obsolete changesets:
+ 94b33453f93b
+ push includes unstable changesets:
+ cda648ca50f5 (orphan)
[255]
with --force it will work anyway
@@ -647,6 +652,26 @@
no changes found
[1]
+pushing should work even if the outgoing changes contain an unrelated changeset
+(neither obsolete nor unstable) (issue6372)
+
+ $ hg up 1 -q
+ $ hg branch new -q
+ $ mkcommit c
+
+ $ hg push ../tmpc/ --new-branch
+ pushing to ../tmpc/
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files (+1 heads)
+
+make later tests work unmodified
+
+ $ hg --config extensions.strip= strip tip -q
+ $ hg up 5 -q
+
Test that extinct changeset are properly detected
$ hg log -r 'extinct()'
@@ -1196,6 +1221,14 @@
phase-divergent: immutable predecessor 245b
content-divergent: predecessor 245b
+ $ hg push ../tmpf -r 50c51b361e60
+ pushing to ../tmpf
+ searching for changes
+ abort: push includes unstable changesets:
+ 50c51b361e60 (orphan, phase-divergent, content-divergent)
+ [255]
+
+
#if serve
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log