Mercurial > hg
view tests/test-resolve @ 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 | 9f73bddb9d0b |
children | 6c82beaaa11a |
line wrap: on
line source
#!/bin/sh # test that a commit clears the merge state. hg init repo cd repo echo foo > file hg commit -Am 'add file' -d '0 0' echo bar >> file hg commit -Am 'append bar' -d '0 0' echo % create a second head hg up -C 0 echo baz >> file hg commit -Am 'append baz' -d '0 0' echo % failing merge HGMERGE=internal:fail hg merge echo resolved > file hg resolve -m file hg commit -m 'resolved' -d '0 0' echo % resolve -l, should be empty hg resolve -l