Mercurial > hg
annotate tests/test-empty.t @ 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 | 4134686b83e1 |
children | f2719b387380 |
rev | line source |
---|---|
11743 | 1 Create an empty repo: |
2 | |
3 $ hg init a | |
4 $ cd a | |
5 | |
6 Try some commands: | |
7 | |
8 $ hg log | |
9 $ hg grep wah | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11743
diff
changeset
|
10 [1] |
11743 | 11 $ hg manifest |
12 $ hg verify | |
13 checking changesets | |
14 checking manifests | |
15 crosschecking files in changesets and manifests | |
16 checking files | |
17 0 files, 0 changesets, 0 total revisions | |
18 | |
19 Check the basic files created: | |
20 | |
21 $ ls .hg | |
22 00changelog.i | |
23 requires | |
24 store | |
25 | |
26 Should be empty: | |
1338 | 27 |
11743 | 28 $ ls .hg/store |
29 | |
30 Poke at a clone: | |
6944
7e5f3480c45b
fix regression on empty repo cloning introduced by 0642d9d7ec80
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1338
diff
changeset
|
31 |
11743 | 32 $ cd .. |
33 $ hg clone a b | |
34 updating to branch default | |
35 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
36 $ cd b | |
37 $ hg verify | |
38 checking changesets | |
39 checking manifests | |
40 crosschecking files in changesets and manifests | |
41 checking files | |
42 0 files, 0 changesets, 0 total revisions | |
43 $ ls .hg | |
44 00changelog.i | |
45 branch | |
46 dirstate | |
47 hgrc | |
48 requires | |
49 store | |
50 | |
51 Should be empty: | |
52 | |
53 $ ls .hg/store |