Mercurial > hg
view tests/test-mq-merge.out @ 8791:23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 13 Jun 2009 18:41:28 +0200 |
parents | 9a398dd53bcc |
children | 561ff8d9e4f0 |
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 applying patcha now at: patcha