Mercurial > hg
view tests/test-websub.t @ 40790:f07d4f94f098 stable
rebase: preserve working copy when redoing in-mem rebase on disk
When in-memory rebase runs into conflicts, we retry it on disk. But
before we do that, we abort the in-memory rebase. That is done because
even though it's mostly in memory, there are still a few state files
written (e.g. the merge state). We should make it not write those
files so we don't need to abort, but for the stable branch, let's
explicitly clear the state we need to clear instead of running the
usual abort code.
Differential Revision: https://phab.mercurial-scm.org/D5356
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 30 Nov 2018 16:21:37 -0800 |
parents | 4d2b9b304ad0 |
children | 6ccf539aec71 |
line wrap: on
line source
#require serve $ hg init test $ cd test $ cat > .hg/hgrc <<EOF > [extensions] > # this is only necessary to check that the mapping from > # interhg to websub works > interhg = > > [websub] > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>| > > [interhg] > # check that we maintain some interhg backwards compatibility... > # yes, 'x' is a weird delimiter... > markbugs = sxbugx<i class="\x">bug</i>x > EOF $ touch foo $ hg add foo $ hg commit -d '1 0' -m 'Issue123: fixed the bug!' $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ cat hg.pid >> $DAEMON_PIDS log $ get-with-headers.py localhost:$HGPORT "rev/tip" | grep bts <div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</div> errors $ cat errors.log $ cd ..