Mercurial > hg
annotate tests/test-export.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 | a5b77eb0409b |
children | 70e11de6964d |
rev | line source |
---|---|
12034
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
1 $ hg init repo |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
2 $ cd repo |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
3 $ touch foo |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
4 $ hg add foo |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
5 $ for i in 0 1 2 3 4 5 6 7 8 9 10 11; do |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
6 > echo "foo-$i" >> foo |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
7 > hg ci -m "foo-$i" |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
8 > done |
3899
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
9 |
12034
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
10 $ for out in "%nof%N" "%%%H" "%b-%R" "%h" "%r"; do |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
11 > echo |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
12 > echo "# foo-$out.patch" |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
13 > hg export -v -o "foo-$out.patch" 2:tip |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
14 > done |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
15 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
16 # foo-%nof%N.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
17 exporting patches: |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
18 foo-01of10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
19 foo-02of10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
20 foo-03of10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
21 foo-04of10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
22 foo-05of10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
23 foo-06of10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
24 foo-07of10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
25 foo-08of10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
26 foo-09of10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
27 foo-10of10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
28 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
29 # foo-%%%H.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
30 exporting patches: |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
31 foo-%617188a1c80f869a7b66c85134da88a6fb145f67.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
32 foo-%dd41a5ff707a5225204105611ba49cc5c229d55f.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
33 foo-%f95a5410f8664b6e1490a4af654e4b7d41a7b321.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
34 foo-%4346bcfde53b4d9042489078bcfa9c3e28201db2.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
35 foo-%afda8c3a009cc99449a05ad8aa4655648c4ecd34.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
36 foo-%35284ce2b6b99c9d2ac66268fe99e68e1974e1aa.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
37 foo-%9688c41894e6931305fa7165a37f6568050b4e9b.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
38 foo-%747d3c68f8ec44bb35816bfcd59aeb50b9654c2f.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
39 foo-%5f17a83f5fbd9414006a5e563eab4c8a00729efd.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
40 foo-%f3acbafac161ec68f1598af38f794f28847ca5d3.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
41 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
42 # foo-%b-%R.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
43 exporting patches: |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
44 foo-repo-2.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
45 foo-repo-3.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
46 foo-repo-4.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
47 foo-repo-5.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
48 foo-repo-6.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
49 foo-repo-7.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
50 foo-repo-8.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
51 foo-repo-9.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
52 foo-repo-10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
53 foo-repo-11.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
54 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
55 # foo-%h.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
56 exporting patches: |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
57 foo-617188a1c80f.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
58 foo-dd41a5ff707a.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
59 foo-f95a5410f866.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
60 foo-4346bcfde53b.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
61 foo-afda8c3a009c.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
62 foo-35284ce2b6b9.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
63 foo-9688c41894e6.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
64 foo-747d3c68f8ec.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
65 foo-5f17a83f5fbd.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
66 foo-f3acbafac161.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
67 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
68 # foo-%r.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
69 exporting patches: |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
70 foo-02.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
71 foo-03.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
72 foo-04.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
73 foo-05.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
74 foo-06.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
75 foo-07.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
76 foo-08.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
77 foo-09.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
78 foo-10.patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
79 foo-11.patch |
7319
eae1767cc6a8
export: fixed silent output file overwriting
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
3899
diff
changeset
|
80 |
12034
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
81 Exporting 4 changesets to a file: |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
82 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
83 $ hg export -o export_internal 1 2 3 4 |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12034
diff
changeset
|
84 $ grep HG export_internal | wc -l |
12377
a5b77eb0409b
tests: various fixes for new unified test pattern format
Matt Mackall <mpm@selenic.com>
parents:
12366
diff
changeset
|
85 \s*4 (re) |
12034
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
86 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
87 Exporting 4 changesets to a file: |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
88 |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12034
diff
changeset
|
89 $ hg export 1 2 3 4 | grep HG | wc -l |
12377
a5b77eb0409b
tests: various fixes for new unified test pattern format
Matt Mackall <mpm@selenic.com>
parents:
12366
diff
changeset
|
90 \s*4 (re) |
12034
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
91 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
92 Exporting revision -2 to a file: |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
93 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
94 $ hg export -- -2 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
95 # HG changeset patch |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
96 # User test |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
97 # Date 0 0 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
98 # Node ID 5f17a83f5fbd9414006a5e563eab4c8a00729efd |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
99 # Parent 747d3c68f8ec44bb35816bfcd59aeb50b9654c2f |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
100 foo-10 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
101 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
102 diff -r 747d3c68f8ec -r 5f17a83f5fbd foo |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
103 --- a/foo Thu Jan 01 00:00:00 1970 +0000 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
104 +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
105 @@ -8,3 +8,4 @@ |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
106 foo-7 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
107 foo-8 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
108 foo-9 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
109 +foo-10 |
3bfd425f1472
tests: unify test-export
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
110 |