Mercurial > hg
view tests/test-filecache.py.out @ 38220:ad50f0399e1e
graft: correct documentation about options can be reapplied
Now options --user and --date can be reapplied after we hit a conflict.
Differential Revision: https://phab.mercurial-scm.org/D3678
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 02 Jun 2018 15:55:28 +0530 |
parents | 57830bd0e787 |
children |
line wrap: on
line source
basic: * neither file exists creating * neither file still exists * empty file x created creating * file x changed size creating * nothing changed with either file * file x changed inode creating * empty file y created creating * file y changed size creating * file y changed inode creating * both files changed inode creating fakeuncacheable: * neither file exists creating * neither file still exists creating * empty file x created creating * file x changed size creating * nothing changed with either file creating * file x changed inode creating * empty file y created creating * file y changed size creating * file y changed inode creating * both files changed inode creating repository tip rolled back to revision -1 (undo commit) working directory now based on revision -1 repository tip rolled back to revision -1 (undo commit) working directory now based on revision -1 setbeforeget: * neither file exists string set externally * file x created creating string from function * string set externally again string 2 set externally * file y created creating string from function antiambiguity: