view tests/test-mq-merge.out @ 6887:304484c7e0ba

Update win32mbcs extension

  * Code cleanup by Matt.
  * Fix the issue with case-insensitive fs support
    by wrapping also util.fspath() and util.checkcase()
  * Abort program when path conversion is failed.

adding a
adding b
copy .hg/patches to .hg/patches.1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
M b
created new head
a
b
merging with queue at: .hg/patches.1
applying rm_a
Now at: rm_a
b
Patch queue now empty

% init t2
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create the reference queue
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% merge
merging with queue at refqueue
(working directory not at tip)
applying patcha
Now at: patcha