Mercurial > hg
annotate tests/test-1102.t @ 26677:e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
After rebasing a set of changes onto a public changeset and having the first one
be skipped, if you try to abort, the operation fails. This fix adds a check to
disallow the target rev into the dstates list within the abort function. This
list is checked for immutable states before the rest of abort does its thing.
author | Christian Delahousse <cdelahousse@fb.com> |
---|---|
date | Tue, 13 Oct 2015 14:06:51 -0700 |
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 .. |