# HG changeset patch # User timeless@mozdev.org # Date 1256474738 -7200 # Node ID 20b91f91f9cadfc2de79e7a2ecc07302b05ebca1 # Parent 6064de41b7e4106bbd1abd4a9e0a515436b6eb73 minor documentation improvements diff -r 6064de41b7e4 -r 20b91f91f9ca help/urls.txt --- a/help/urls.txt Sun Oct 25 14:28:02 2009 +0100 +++ b/help/urls.txt Sun Oct 25 14:45:38 2009 +0200 @@ -47,7 +47,7 @@ ... You can then use the alias for any command that uses a URL (for -example 'hg pull alias1' would pull from the 'alias1' path). +example 'hg pull alias1' will be treated as 'hg pull URL1'). Two path aliases are special because they are used as defaults when you do not provide the URL to a command: diff -r 6064de41b7e4 -r 20b91f91f9ca mercurial/commands.py --- a/mercurial/commands.py Sun Oct 25 14:28:02 2009 +0100 +++ b/mercurial/commands.py Sun Oct 25 14:45:38 2009 +0200 @@ -1718,7 +1718,8 @@ def import_(ui, repo, patch1, *patches, **opts): """import an ordered set of patches - Import a list of patches and commit them individually. + Import a list of patches and commit them individually (unless + --no-commit is specified). If there are outstanding changes in the working directory, import will abort unless given the -f/--force flag.