Mercurial > hg
view tests/test-hg-parseurl.py.out @ 27048:86290f6f6599
mergestate._resolve: handle change/delete conflicts
We will represent a deleted file as 'nullhex' in the in-memory and on-disk
merge states. We need to be able to create absentfilectxes in that case, and
delete the file from disk rather than try to write it out.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 20 Nov 2015 01:14:15 -0800 |
parents | 375872fdadba |
children |
line wrap: on
line source
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', [])