Mercurial > hg
annotate tests/test-1102.t @ 24993:be58bd30a478
amend: use dirstateguard instead of dirstate.invalidate
Before this patch, "cmdutil.amend()" uses "dirstate.invalidate()" as a
kind of "restore .hg/dirstate to the original status" during a failure.
But it just discards changes in memory, and doesn't actually restore
".hg/dirstate". Then, it can't work as expected, if "dirstate.write()"
is executed while processing.
This patch uses "dirstateguard" instead of "dirstate.invalidate()" to
restore ".hg/dirstate" at failure even if "dirstate.write()" is
executed before failure.
This is a part of preparations to fix the issue that the recent (in
memory) dirstate isn't visible to external process (e.g. "precommit"
hook).
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Thu, 07 May 2015 12:07:10 +0900 |
parents | f2719b387380 |
children |
rev | line source |
---|---|
11847 | 1 $ rm -rf a |
2 $ hg init a | |
3 $ cd a | |
4 $ echo a > a | |
5 $ hg ci -Am0 | |
6 adding a | |
7 $ hg tag t1 # 1 | |
8 $ hg tag --remove t1 # 2 | |
6671
938eddd76237
tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 |
11847 | 10 $ hg co 1 |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
11847
diff
changeset
|
12 $ hg tag -f -r0 t1 |
11847 | 13 $ hg tags |
14 tip 3:a49829c4fc11 | |
15 t1 0:f7b1eb17ad24 | |
6671
938eddd76237
tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13135
diff
changeset
|
17 $ cd .. |