Mercurial > evolve
changeset 1546:69a0d60f9c99
evolve: fix test-inhibit to match latest hg
When I fixed an issue in core about rebaseset 40a2f972f26d (that I introduced
before), it restored the original behavior of inhibit with rebase. This patch
fixes test-inhibit to match the latest hg.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Fri, 04 Dec 2015 14:00:59 -0800 |
| parents | 13701c3fed9c |
| children | 425c0700aabd |
| files | tests/test-inhibit.t |
| diffstat | 1 files changed, 1 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-inhibit.t Fri Dec 04 14:00:48 2015 -0800 +++ b/tests/test-inhibit.t Fri Dec 04 14:00:59 2015 -0800 @@ -429,41 +429,6 @@ | o 12:fe1634cbe235 add cK | - | o 11:53a94305e133 add cL - | | - | o 10:ad78ff7d621f add cK - | | - | | @ 9:55c73a90e4b4 add cJ - | | | - | | | o 7:18214586bf78 add cJ - | | |/ - | | o 6:cf5c4f4554ce add cH - | | | - | | o 5:5419eb264a33 add cG - | | | - | | o 4:98065434e5c6 add cE - | |/ - o | 3:2db36d8066ff add cD - | | - o | 2:7df62a38b9bf add cC - | | - o | 1:02bcbc3f6e56 add cB - |/ - o 0:54ccbc537fc2 add cA - - -Performing the rebase made ad78ff7d621f and 53a94305e133 visible, we prune -them to make the graph more legible. It used to be the case that directaccess -and inhibit were not making these revisions visible. Both behavior are -acceptable but to keep the test changes minimal we prune those changesets. - - $ hg strip ad78ff7d621f:: - 2 changesets pruned - $ hg log -G - o 13:2f7b7704d714 add cL - | - o 12:fe1634cbe235 add cK - | | @ 9:55c73a90e4b4 add cJ | | | | o 7:18214586bf78 add cJ @@ -482,6 +447,7 @@ |/ o 0:54ccbc537fc2 add cA + Check that amending in the middle of a stack does not show obsolete revs Since we are doing operation in the middle of the stack we cannot just have createmarkers as we are creating instability @@ -800,7 +766,6 @@ $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext/directaccess.py" >> $HGRCPATH $ cd .. - hg push should not allow directaccess unless forced with --hidden We copy the inhibhit repo to inhibit2 and make some changes to push to inhibit