tests/test-hg-parseurl.py.out
author Siddharth Agarwal <sid0@fb.com>
Mon, 01 Feb 2016 20:28:32 -0800
changeset 28020 cffa46cbdb8f
parent 13897 375872fdadba
permissions -rw-r--r--
merge: tell _checkunknownfiles about whether this was merge --force In an upcoming patch we'll have different behavior here for when 'merge --force' is used as opposed to when other kinds of force operations are performed, like rebases.

http://example.com/no/anchor, branches: (None, [])
http://example.com/an/anchor, branches: ('foo', [])
http://example.com/no/anchor/branches, branches: (None, ['foo'])
http://example.com/an/anchor/branches, branches: ('bar', ['foo'])
http://example.com/an/anchor/branches-None, branches: ('foo', [])
http://example.com/, branches: (None, [])
http://example.com/, branches: (None, [])
http://example.com/, branches: ('foo', [])