Mercurial > hg
annotate tests/test-nested-repo.t @ 15800:e4fc0f0b4f7e stable
rebase: reinstate old-style rev spec support for the source and base (issue3181)
As of b12362ab13e7 (first released as part of Mercurial 2.0), the rebase command
accepted ONLY revsets for the source and base arguments and no longer accepted
old-style revision specifications. As a result, some revision names were no
longer recognised, e.g.
hg rebase --base br-anch
abort: unknown revision 'br'!
These arguments are now interpreted first as old-style revision specifications,
then as revsets when no matching revision is found. This restores backwards
compatibility with releases prior to 2.0.
author | Steven Brown <StevenGBrown@gmail.com> |
---|---|
date | Sun, 08 Jan 2012 23:09:35 +0800 |
parents | 93452579df9e |
children | 9910f60a37ee |
rev | line source |
---|---|
12279 | 1 $ hg init a |
2 $ cd a | |
3 $ hg init b | |
4 $ echo x > b/x | |
5 | |
6 Should print nothing: | |
2061
5987c1eac2ce
support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 |
12279 | 8 $ hg add b |
9 $ hg st | |
10 | |
11 Should fail: | |
5158
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2982
diff
changeset
|
12 |
12279 | 13 $ hg st b/x |
13910
93452579df9e
audit: improve nested repo message
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
14 abort: path 'b/x' is inside nested repo 'b' |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
15 [255] |
12279 | 16 $ hg add b/x |
13910
93452579df9e
audit: improve nested repo message
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
17 abort: path 'b/x' is inside nested repo 'b' |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
18 [255] |
5158
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2982
diff
changeset
|
19 |
12279 | 20 Should fail: |
2061
5987c1eac2ce
support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
21 |
12279 | 22 $ hg add b b/x |
13910
93452579df9e
audit: improve nested repo message
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
23 abort: path 'b/x' is inside nested repo 'b' |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
24 [255] |
12279 | 25 $ hg st |
26 | |
27 Should arguably print nothing: | |
28 | |
29 $ hg st b | |
5200
c7e8fe11f34a
path_auditor: cache names of audited directories
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5158
diff
changeset
|
30 |
12279 | 31 $ echo a > a |
32 $ hg ci -Ama a | |
33 | |
34 Should fail: | |
5158
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2982
diff
changeset
|
35 |
12279 | 36 $ hg mv a b |
13910
93452579df9e
audit: improve nested repo message
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
37 abort: path 'b/a' is inside nested repo 'b' |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
38 [255] |
12279 | 39 $ hg st |
5158
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2982
diff
changeset
|
40 |