##// END OF EJS Templates
histedit: make check for unresolved conflicts explicit (issue5545)...
histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.

File last commit:

r28806:d26c4af2 default
r32057:e5ffc91a stable
Show More
test-hg-parseurl.py
17 lines | 580 B | text/x-python | PythonLexer
from __future__ import absolute_import, print_function
from mercurial import (
hg,
)
def testparse(url, branch=[]):
print('%s, branches: %r' % hg.parseurl(url, branch))
testparse('http://example.com/no/anchor')
testparse('http://example.com/an/anchor#foo')
testparse('http://example.com/no/anchor/branches', branch=['foo'])
testparse('http://example.com/an/anchor/branches#bar', branch=['foo'])
testparse('http://example.com/an/anchor/branches-None#foo', branch=None)
testparse('http://example.com/')
testparse('http://example.com')
testparse('http://example.com#foo')