view tests/test-rebase-pull.out @ 8335:713ec3f9c9de

inotify: Clarify the use of "watcher" name.

Currently, Watcher is a class in inotify.linux.watcher, but it's also a class
in inotify.server . To complicate things further more, the latter has a
'watcher' attribute, an instance of the former class.

When it comes to the 'watcher' attribute of the Server class in inotify.server,
one can get quite confused: is it a Watcher object from inotify.server, or from
inotify.linux.watcher?

Changes:
* in inotify.linux.watcher : nothing
* in inotify.server :
    ** Watcher class is renamed to RepoWatcher
    ** server.watcher is renamed to server.repowatcher

updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved

% Now b has one revision to be pulled from a
pulling from 
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
rebase completed
@  3:L1
|
o  2:R1
|
o  1:C2
|
o  0:C1


% Re-run pull --rebase
pulling from 
searching for changes
no changes found

% Invoke pull --rebase and nothing to rebase
pulling from 
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
nothing to rebase
@  2
|

% pull --rebase --update should ignore --update
pulling from 
searching for changes
no changes found

% pull --rebase doesn't update if nothing has been pulled
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
pulling from 
searching for changes
no changes found
o  2
|