--- a/tests/test-inhibit.t Tue Nov 24 17:16:27 2015 -0800
+++ b/tests/test-inhibit.t Mon Nov 30 16:48:40 2015 -0800
@@ -751,6 +751,17 @@
nothing changed
[1]
+Check that the behavior of rebase with obsolescence markers is maintained
+despite inhibit
+
+ $ hg up a438c045eb37
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg rebase -r 15:: -d 21 --config experimental.rebaseskipobsolete=True
+ note: not rebasing 15:2d66e189f5b5 "add cM", already in destination as 21:721c3c279519 "add cM"
+ rebasing 16:a438c045eb37 "add cN"
+ $ hg up 21
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+
Directaccess should load after some extensions precised in the conf
With no extension specified:
@@ -765,7 +776,7 @@
> EOF
$ hg id
['rebase', 'strip', 'evolve', 'directaccess', 'inhibit', 'testextension']
- 721c3c279519 tip
+ 721c3c279519
With test_extension specified:
$ cat >> $HGRCPATH << EOF
@@ -774,7 +785,7 @@
> EOF
$ hg id
['rebase', 'strip', 'evolve', 'inhibit', 'testextension', 'directaccess']
- 721c3c279519 tip
+ 721c3c279519
Inhibit should not work without directaccess
$ cat >> $HGRCPATH <<EOF
@@ -797,6 +808,7 @@
$ pwd=$(pwd)
$ cd inhibit
$ mkcommit pk
+ created new head
$ hg id
003a4735afde tip
$ echo "OO" > pk
@@ -818,7 +830,7 @@
adding changesets
adding manifests
adding file changes
- added 1 changesets with 1 changes to 1 files
+ added 1 changesets with 1 changes to 1 files (+1 heads)
2 new obsolescence markers
Pulling from a inhibit repo to a non-inhibit repo should work