comparison mercurial/commands.py @ 6622:92ee960a928d

merge from crew-stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 22 May 2008 13:29:47 +0200
parents 0697e7818d07 4f3e0dfa24a9
children 0397f592372f
comparison
equal deleted inserted replaced
6619:170818dad56b 6622:92ee960a928d
2079 destination is local this is identical to a pull in that directory 2079 destination is local this is identical to a pull in that directory
2080 from the current one. 2080 from the current one.
2081 2081
2082 By default, push will refuse to run if it detects the result would 2082 By default, push will refuse to run if it detects the result would
2083 increase the number of remote heads. This generally indicates the 2083 increase the number of remote heads. This generally indicates the
2084 the client has forgotten to sync and merge before pushing. 2084 the client has forgotten to pull and merge before pushing.
2085 2085
2086 Valid URLs are of the form: 2086 Valid URLs are of the form:
2087 2087
2088 local/filesystem/path (or file://local/filesystem/path) 2088 local/filesystem/path (or file://local/filesystem/path)
2089 ssh://[user@]host[:port]/[path] 2089 ssh://[user@]host[:port]/[path]
2090 http://[user@]host[:port]/[path] 2090 http://[user@]host[:port]/[path]
2091 https://[user@]host[:port]/[path] 2091 https://[user@]host[:port]/[path]
2092 2092
2093 An optional identifier after # indicates a particular branch, tag, 2093 An optional identifier after # indicates a particular branch, tag,
2094 or changeset to push. 2094 or changeset to push. If -r is used, the named changeset and all its
2095 ancestors will be pushed to the remote repository.
2095 2096
2096 Look at the help text for the pull command for important details 2097 Look at the help text for the pull command for important details
2097 about ssh:// URLs. 2098 about ssh:// URLs.
2098 2099
2099 Pushing to http:// and https:// URLs is only possible, if this 2100 Pushing to http:// and https:// URLs is only possible, if this