tests/test-symlink-os-yes-fs-no.py.out
author Siddharth Agarwal <sid0@fb.com>
Tue, 17 Nov 2015 14:04:56 -0800
changeset 27005 3185c01c551c
parent 11769 ca6cebd8734e
child 34661 eb586ed5d8ce
permissions -rw-r--r--
mergestate: move _read() call to read constructor With this patch, mergestate.clean() will no longer abort when it encounters an unsupported merge type. However we hold off on testing it until backwards compatibility is in place.

requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved