view tests/test-hg-parseurl.py.out @ 26949:b639b2f186bf

merge.applyupdates: only attempt to merge files in mergeactions

This only makes a difference when a merge driver is active -- in that case we
don't want to try and merge all the files, just the ones still unresolved after
the merge driver's preprocess step is over.

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', [])