--- a/hgext/notify.py Tue Apr 07 23:06:50 2009 +0200
+++ b/hgext/notify.py Wed Apr 08 00:41:07 2009 +0200
@@ -61,8 +61,8 @@
glob patterns are matched against path to repository root.
- if you like, you can put notify config file in repository that users can
- push changes to, they can manage their own subscriptions.'''
+ if you like, you can put notify config file in repository that users
+ can push changes to, they can manage their own subscriptions.'''
from mercurial.i18n import _
from mercurial import patch, cmdutil, templater, util, mail
--- a/mercurial/commands.py Tue Apr 07 23:06:50 2009 +0200
+++ b/mercurial/commands.py Wed Apr 08 00:41:07 2009 +0200
@@ -2924,14 +2924,15 @@
Use null as the revision to remove the working copy (like 'hg
clone -U').
- When the working directory contains no uncommitted changes, it will be
- replaced by the state of the requested revision from the repository.
- When the requested revision is on a different branch, the working
- directory will additionally be switched to that branch.
+ When the working directory contains no uncommitted changes, it
+ will be replaced by the state of the requested revision from the
+ repository. When the requested revision is on a different branch,
+ the working directory will additionally be switched to that
+ branch.
When there are uncommitted changes, use option -C to discard them,
- forcibly replacing the state of the working directory with the requested
- revision.
+ forcibly replacing the state of the working directory with the
+ requested revision.
When there are uncommitted changes and option -C is not used, and
the parent revision and requested revision are on the same branch,
--- a/tests/test-notify.out Tue Apr 07 23:06:50 2009 +0200
+++ b/tests/test-notify.out Wed Apr 08 00:41:07 2009 +0200
@@ -54,8 +54,8 @@
glob patterns are matched against path to repository root.
- if you like, you can put notify config file in repository that users can
- push changes to, they can manage their own subscriptions.
+ if you like, you can put notify config file in repository that users
+ can push changes to, they can manage their own subscriptions.
no commands defined
% commit