Mercurial > hg
annotate README @ 12681:bc13e17067d9
update: use higher level wording for "crosses branches" error
When using "hg update" to update to a revision on another branch, if
the user has uncommitted changes in the working directory, hg aborts
with the following message:
abort: crosses branches (use 'hg merge' to merge or use 'hg update
-C' to discard changes)
If the user isn't trying to update to tip and they follow the command
examples verbatim, they would end up updating to the wrong revision.
This patch removes the command examples in favor of just telling the
user to either merge or use --clean:
abort: crosses branches (merge branches or use --clean to discard
changes)
hg also aborts if the user tries to use "hg update" to get to tip
(without specifying a revision) and tip is on another branch:
abort: crosses branches (use 'hg merge' or use 'hg update -c')
This message is changed in the same fashion:
abort: crosses branches (merge branches or use --check to force
update)
| author | Brodie Rao <brodie@bitheap.org> |
|---|---|
| date | Sat, 09 Oct 2010 17:02:28 -0500 |
| parents | a41f2840f9c6 |
| children | 5c6c10e6b5a6 |
| rev | line source |
|---|---|
| 3935 | 1 Basic install: |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
2 |
| 3935 | 3 $ make # see install targets |
| 4 $ make install # do a system-wide install | |
| 5 $ hg debuginstall # sanity-check setup | |
| 6 $ hg # see help | |
|
205
d255d99a7cbd
README: integrate some changes from Kevin Smith
mpm@selenic.com
parents:
204
diff
changeset
|
7 |
|
8936
1de6e7e1bb9f
change wiki/bts URLs to point to new hostname
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
3935
diff
changeset
|
8 See http://mercurial.selenic.com/ for detailed installation |
| 3935 | 9 instructions, platform-specific notes, and Mercurial user information. |
| 327 | 10 |