Mercurial > hg
view tests/test-merge-types.out @ 8048:d22432bdcba1
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.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 11 Apr 2009 21:17:11 +0200 |
parents | 8dca507e56ce |
children | af5f099d932b |
line wrap: on
line source
adding a 0 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head resolving manifests overwrite None partial False ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c searching for copies back to rev 1 conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: update permissions -> e 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % symlink is local parent, executable is other a has no flags (default for conflicts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved resolving manifests overwrite None partial False ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f searching for copies back to rev 1 conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: remote is newer -> g getting a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % symlink is other parent, executable is local a has no flags (default for conflicts)