diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1681,11 +1681,13 @@ def bundle(ui, repo, fname, *dests, **op # support the necessary features. cfg = ui.configbool obsolescence_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker') - bundlespec.set_param(b'obsolescence', obsolescence_cfg) + bundlespec.set_param(b'obsolescence', obsolescence_cfg, overwrite=False) obs_mand_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker:mandatory') - bundlespec.set_param(b'obsolescence-mandatory', obs_mand_cfg) + bundlespec.set_param( + b'obsolescence-mandatory', obs_mand_cfg, overwrite=False + ) phases_cfg = cfg(b'experimental', b'bundle-phases') - bundlespec.set_param(b'phases', phases_cfg) + bundlespec.set_param(b'phases', phases_cfg, overwrite=False) bundle2.writenewbundle( ui, diff --git a/tests/test-obsolete-bundle-strip.t b/tests/test-obsolete-bundle-strip.t --- a/tests/test-obsolete-bundle-strip.t +++ b/tests/test-obsolete-bundle-strip.t @@ -1491,6 +1491,6 @@ Test bundlespec overwrite default 1 changesets found $ hg debugbundle bundle-type-with-obs --part-type obsmarkers Stream params: {Compression: BZ} - obsmarkers -- {} (mandatory: True) (missing-correct-output !) - version: 1 (50 bytes) (missing-correct-output !) - 1ea73414a91b0920940797d8fc6a11e447f8ea1e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} (missing-correct-output !) + obsmarkers -- {} (mandatory: True) + version: 1 (50 bytes) + 1ea73414a91b0920940797d8fc6a11e447f8ea1e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}