Mercurial > hg
view tests/test-inotify.out @ 11716:db426935fa94 stable
progress: use gerund (updating) for merge progress
author | timeless <timeless@gmail.com> |
---|---|
date | Fri, 30 Jul 2010 10:32:24 +0300 |
parents | 6f1894d6a6b0 |
children |
line wrap: on
line source
adding a adding b adding c adding d adding dir/bar/foo adding dir/x adding dir/y adding e updating to branch default 8 files updated, 0 files merged, 0 files removed, 0 files unresolved M a % inserve % cannot start, already bound abort: inotify-server: cannot start: socket is already bound ? hg.pid % clean C a C b C c C d C dir/bar/foo C dir/x C dir/y C e % all ? hg.pid C a C b C c C d C dir/bar/foo C dir/x C dir/y C e % path patterns M dir/x ? hg.pid M dir/x M x % issue 1375 adding h/h adding hg.pid removing h/h A h R h/h M a 1 files updated, 1 files merged, 2 files removed, 0 files unresolved M a 3 files updated, 1 files merged, 0 files removed, 0 files unresolved M a adding 1844/foo