Mercurial > hg
annotate tests/test-1102.t @ 23440:57d35d3c1cf1 stable
rebase: ignore negative state when updating back to original wc parent
The state mapping also contains some magic negative values (detached
parent, ignored revision). Blindly reading the state thus lead to
unfortunate usage of the negative value as an update destination. We
now filter them out.
We do a minor alteration of the test to catch this.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Tue, 02 Dec 2014 11:06:38 -0800 |
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 .. |