view tests/test-mq-merge.out @ 4947:3e25a6eb5c9a

lock.py: cache hostname, but not pid, in case we fork
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 19 Jul 2007 15:13:48 -0700
parents a210b40d0860
children 4b0c9c674707
line wrap: on
line source

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
a
b
merging with queue at: .hg/patches.1
applying rm_a
Now at: rm_a
b
Patch queue now empty