Mercurial > hg
view tests/test-merge9.out @ 8108:a26d33749bd8
made repo locks recursive and deprecate refcounting based lock releasing
all locks should use the explicit lock.release
mercurial.lock.lock.__del__ handles unwrapping recursive locks
localrepo.lock/wlock are still using weakref in order to keep backward
compatibiltiy to releasing locks via garbage collection
by ensuring the release on __del__
author | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> |
---|---|
date | Wed, 22 Apr 2009 02:01:22 +0200 |
parents | 30cb79d84352 |
children | b2310903c462 |
line wrap: on
line source
adding bar adding foo adding quux1 adding quux2 created new head merging bar merging bar failed! merging foo and baz to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon U bar R baz 3 files updated, 0 files merged, 1 files removed, 0 files unresolved merging bar merging bar failed! merging baz and foo to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon % show unresolved U bar R baz % unmark baz % show U bar U baz M bar M baz M quux2 ? bar.orig % re-resolve baz merging baz and foo to baz % after U bar R baz % resolve all warning abort: no files or directories specified; use --all to remerge all files % resolve all merging bar warning: conflicts during merge. merging bar failed! % after U bar R baz