Mercurial > hg
annotate tests/test-update-issue1456.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 | 4134686b83e1 |
children | db0340f4b507 |
rev | line source |
---|---|
12279 | 1 $ rm -rf a |
2 $ hg init a | |
3 $ cd a | |
7569
89207edf3973
correctly update dirstate after update+mode change (issue1456)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
4 |
12279 | 5 $ echo foo > foo |
6 $ hg ci -qAm0 | |
7 $ chmod +x foo | |
8 $ hg ci -m1 | |
9 $ hg co -q 0 | |
10 $ echo dirty > foo | |
11 $ hg up -c | |
12 abort: uncommitted local changes | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
13 [255] |
12279 | 14 $ hg up -q |
15 $ cat foo | |
16 dirty | |
17 $ hg st -A | |
18 M foo | |
7569
89207edf3973
correctly update dirstate after update+mode change (issue1456)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
19 |
12279 | 20 Validate update of standalone execute bit change: |
21 | |
22 $ hg up -C 0 | |
23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
24 $ chmod -x foo | |
25 $ hg ci -m removeexec | |
26 nothing changed | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
27 [1] |
12279 | 28 $ hg up -C 0 |
29 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
30 $ hg up | |
31 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
32 $ hg st | |
33 |