Mercurial > hg
annotate tests/test-update-issue1456.t @ 15604:b8d8599410da stable
rollback: always call destroyed() (regression from 1.9)
The contract for repo.destroyed() is that it is called whenever
changesets are destroyed, either by strip or by rollback. That
contract was inadvertently broken in 7c26ce9edbd2, when we made a
chunk of code conditional on destroying one of the working dir's
parents. Oops: it doesn't matter *which* changesets are destroyed or
what their relationship is to the working dir, we should call
repo.destroyed() whenever we destroy changesets.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Thu, 01 Dec 2011 17:39:30 -0500 |
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 |