Mercurial > hg
view tests/test-mq-merge.out @ 6994:bf727bab38b9
Use relative imports in inotify.server.
Fixes an import failure I was getting under hgtk and hgweb:
*** failed to import extension inotify: 'module' object has no attribute 'inotify'
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 19 Aug 2008 15:36:03 -0700 |
parents | f18f14bae172 |
children | fb32ae9c76e7 |
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 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