tests/test-resolve.out
author Patrick Mezard <pmezard@gmail.com>
Sat, 11 Apr 2009 21:17:11 +0200
changeset 8048 d22432bdcba1
parent 7821 9fe7e6acf525
child 9468 b2310903c462
permissions -rw-r--r--
convert/cvs: delay CVS log parsing after initialization (issue1581/2) Source and destination constructors should be fast so configurations issues are hit quickly, including authentication and filemap/authormap/splicemap issues. Delaying might be a problem if the remove side disconnects idle connections while the log is being read. It did not happen when converting openafs repository, where log retrieval took at least 10mn.

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% resolve -l, should be empty