Skip to content
Snippets Groups Projects
Commit 6b42343f authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

tests: avoid using rebaseskipobsolete=0

I'm about to delete the `rebaseskipobsolete` config. This patch
updates a test to get hidden commits into the rebase state by using
`hg debugobsolete` instead of setting `rebaseskipobsolete=0`.

Differential Revision: https://phab.mercurial-scm.org/D10270
parent d9601243
No related branches found
No related tags found
No related merge requests found
......@@ -23,7 +23,6 @@
$ hg init rbsrepo && cd rbsrepo
$ echo "[experimental]" > .hg/hgrc
$ echo "evolution=true" >> .hg/hgrc
$ echo "rebaseskipobsolete=on" >> .hg/hgrc
$ echo root > root && hg ci -Am root
adding root
$ echo a > a && hg ci -Am a
......@@ -124,8 +123,8 @@
/
o 0:426bada5c675 A
For some reasons (--hidden, rebaseskipobsolete=0, directaccess, etc.),
For some reasons (--hidden, directaccess, etc.),
rebasestate may contain hidden hashes. "rebase --abort" should work regardless.
$ hg init $TESTTMP/hidden-state1
$ cd $TESTTMP/hidden-state1
......@@ -128,12 +127,8 @@
rebasestate may contain hidden hashes. "rebase --abort" should work regardless.
$ hg init $TESTTMP/hidden-state1
$ cd $TESTTMP/hidden-state1
$ cat >> .hg/hgrc <<EOF
> [experimental]
> rebaseskipobsolete=0
> EOF
$ hg debugdrawdag <<'EOS'
> C
> |
......@@ -136,12 +131,12 @@
$ hg debugdrawdag <<'EOS'
> C
> |
> D B # prune: B, C
> |/ # B/D=B
> D B # B/D=B
> |/
> A
> EOS
$ eval `hg tags -T '{tag}={node}\n'`
$ rm .hg/localtags
......@@ -142,12 +137,10 @@
> A
> EOS
$ eval `hg tags -T '{tag}={node}\n'`
$ rm .hg/localtags
$ hg update -q $C --hidden
updated to hidden changeset 7829726be4dc
(hidden revision '7829726be4dc' is pruned)
$ hg update -q $C
$ hg rebase -s $B -d $D
rebasing 1:2ec65233581b "B"
merging D
......@@ -155,8 +148,15 @@
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240]
$ hg debugobsolete $B
1 new obsolescence markers
obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete $C
1 new obsolescence markers
obsoleted 1 changesets
$ cp -R . $TESTTMP/hidden-state2
$ hg log -G
@ 2:b18e25de2cf5 D
|
......@@ -158,9 +158,9 @@
$ cp -R . $TESTTMP/hidden-state2
$ hg log -G
@ 2:b18e25de2cf5 D
|
| % 1:2ec65233581b B (pruned using prune)
| % 1:2ec65233581b B (pruned)
|/
o 0:426bada5c675 A
......@@ -183,6 +183,6 @@
(no more unresolved files)
continue: hg rebase --continue
$ hg rebase --continue
rebasing 1:2ec65233581b "B"
rebasing 3:7829726be4dc tip "C"
note: not rebasing 1:2ec65233581b "B", it has no successor
note: not rebasing 3:7829726be4dc tip "C", it has no successor
$ hg log -G
......@@ -188,9 +188,5 @@
$ hg log -G
@ 5:1964d5d5b547 C
|
o 4:68deb90c12a2 B
|
o 2:b18e25de2cf5 D
@ 2:b18e25de2cf5 D
|
o 0:426bada5c675 A
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment