[prev in list] [next in list] [prev in thread] [next in thread]
List: mercurial-devel
Subject: D10271: tests: replace a use of rebaseskipobsolete=0 by `hg rebase --keep`
From: "martinvonz (Martin von Zweigbergk)" <phabricator () mercurial-scm ! org>
Date: 2021-03-25 23:36:10
Message-ID: differential-rev-PHID-DREV-col2q2cu3xtwvc7tc4dk-req () mercurial-scm ! org
[Download RAW message or body]
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
I'm about to delete the `experimental.rebaseskipobsolete` config, so
this test case won't be able to exist in its current form. This patch
updates it to use `--keep` instead of `--config
experimental.rebaseskipobsolete=off` to allow it to rebase pruned
commits. I suspect some of the cases covered by the test will no
longer be tested now, but that doesn't matter if we make those cases
impossible by removing the config (some later patch).
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D10271
AFFECTED FILES
tests/test-rebase-obsolete.t
CHANGE DETAILS
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -208,7 +208,7 @@
|/
o 0:cd010b8cd998 A
- $ hg rebase --source 'desc(B)' --dest 'tip' --config \
experimental.rebaseskipobsolete=True + $ hg rebase --source 'desc(B)' --dest 'tip'
rebasing 8:8877864f1edb "B"
note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 \
tip "D" rebasing 10:5ae4c968c6ac "C"
@@ -654,16 +654,15 @@
1 new obsolescence markers
obsoleted 1 changesets
- $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config \
experimental.rebaseskipobsolete=off + $ hg rebase --rev .~1::. --dest 'max(desc(D))' \
--keep rebasing 9:4bde274eefcf "I"
rebasing 13:06edfc82198f tip "J"
- 2 new content-divergent changesets
$ hg log -G
@ 15:5ae8a643467b J
|
- * 14:9ad579b4a5de I
+ o 14:9ad579b4a5de I
|
- | * 12:acd174b7ab39 I
+ | o 12:acd174b7ab39 I
| |
| o 11:6c11a6218c97 H
| |
@@ -713,7 +712,7 @@
| |
| x 14:9ad579b4a5de I (rewritten using amend as 16:fc37a630c901)
|/
- | * 12:acd174b7ab39 I
+ | o 12:acd174b7ab39 I
| |
| o 11:6c11a6218c97 H
| |
@@ -737,7 +736,7 @@
|/
o 0:cd010b8cd998 A
- $ hg rebase -s 14 -d 17 --config experimental.rebaseskipobsolete=True
+ $ hg rebase -s 14 -d 17
note: not rebasing 14:9ad579b4a5de "I", already in destination as 16:fc37a630c901 \
"K" rebasing 15:5ae8a643467b "J"
1 new orphan changesets
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic