merge from crew-stable
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Fri, 23 May 2008 14:02:48 +0200
changeset 6636 0397f592372f
parent 6622 92ee960a928d (current diff)
parent 6625 4d3a60d5c490 (diff)
child 6637 79434e68512a
merge from crew-stable
mercurial/commands.py
--- a/.hgsigs	Thu May 22 13:29:47 2008 +0200
+++ b/.hgsigs	Fri May 23 14:02:48 2008 +0200
@@ -5,3 +5,4 @@
 fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694 0 iD8DBQBGgHicywK+sNU5EO8RAgNxAJ0VG8ixAaeudx4sZbhngI1syu49HQCeNUJQfWBgA8bkJ2pvsFpNxwYaX3I=
 23889160905a1b09fffe1c07378e9fc1827606eb 0 iD8DBQBHGTzoywK+sNU5EO8RAr/UAJ0Y8s4jQtzgS+G9vM8z6CWBThZ8fwCcCT5XDj2XwxKkz/0s6UELwjsO3LU=
 bae2e9c838e90a393bae3973a7850280413e091a 0 iD8DBQBH6DO5ywK+sNU5EO8RAsfrAJ0e4r9c9GF/MJsM7Xjd3NesLRC3+ACffj6+6HXdZf8cswAoFPO+DY00oD0=
+d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 0 iD8DBQBINdwsywK+sNU5EO8RAjIUAKCPmlFJSpsPAAUKF+iNHAwVnwmzeQCdEXrL27CWclXuUKdbQC8De7LICtE=
--- a/.hgtags	Thu May 22 13:29:47 2008 +0200
+++ b/.hgtags	Fri May 23 14:02:48 2008 +0200
@@ -17,3 +17,4 @@
 fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694 0.9.4
 23889160905a1b09fffe1c07378e9fc1827606eb 0.9.5
 bae2e9c838e90a393bae3973a7850280413e091a 1.0
+d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 1.0.1
--- a/mercurial/commands.py	Thu May 22 13:29:47 2008 +0200
+++ b/mercurial/commands.py	Fri May 23 14:02:48 2008 +0200
@@ -532,6 +532,9 @@
     subsequent revisions will be present in the cloned repository.
     This option implies --pull, even on local repositories.
 
+    If the -U option is used, the new clone will contain only a repository
+    (.hg) and no working copy (the working copy parent is the null revision).
+
     See pull for valid source format details.
 
     It is possible to specify an ssh:// URL as the destination, but no
@@ -2990,7 +2993,8 @@
          _('hg cat [OPTION]... FILE...')),
     "^clone":
         (clone,
-         [('U', 'noupdate', None, _('do not update the new working directory')),
+         [('U', 'noupdate', None,
+          _('the clone will only contain a repository (no working copy)')),
           ('r', 'rev', [],
            _('a changeset you would like to have after cloning')),
           ('', 'pull', None, _('use pull protocol to copy metadata')),