tests/test-rebase-abort.out
author Brodie Rao <me+hg@dackz.net>
Fri, 05 Mar 2010 17:38:02 -0500
branchstable
changeset 10669 181cbb23572e
parent 6906 808f03f61ebe
child 11198 b345b1cc124f
permissions -rw-r--r--
test-extension: fix disabled extension tests for run-tests.py --local One test that requires inserting a broken extension into hgext does this by modifying PYTHONPATH. This doesn't work when run with --local because the 'hg' script being used is in the same directory as the local hgext. Instead of modifying PYTHONPATH, a secondary extension is enabled using --config that inserts the dummy hgext at the beginning of sys.path, before the script's path.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@  4: L2
|
o  3: L1
|
| o  2: C3
|/
o  1: C2
|
o  0: C1


% Conflicting rebase
merging common
warning: conflicts during merge.
merging common failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue

% Abort
rebase aborted
@  4: L2
|
o  3: L1
|
| o  2: C3
|/
o  1: C2
|
o  0: C1