Mercurial > hg

annotate tests/bundles/test-no-symlinks.hg @ 27048:86290f6f6599

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cd3032437064
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14116
cd3032437064 tests: move test bundles in a bundles/ subdirectory
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 5089
diff changeset
1 (binary:application/octet-stream)