view tests/test-abort-checkin.out @ 3733:9e67fecbfd16

merge: handle directory renames commit: handle new copy dirstate case correctly findcopies: keep a map of all copies found for directory logic add dirs filter check for merge:followdirs config option generate a directory move map find files that match directory move map manifestmerge: add directory rename cases applyupdates: skip actions with None file add "d" action recordupdates: add "d" action add simple directory rename test
author Matt Mackall <mpm@selenic.com>
date Thu, 30 Nov 2006 17:36:33 -0600
parents 6bd351194a96
children 193e0f8d9a47
line wrap: on
line source

abort: edit failed: false exited with status 1
transaction abort!
rollback completed
abort: edit failed: false exited with status 1
transaction abort!
rollback completed