Mercurial > hg
annotate tests/test-backwards-remove.t @ 18447:7159426c8d13
rebase: properly handle unrebased revision between rebased one
With rebase taking multiple roots it is possible to have revision in the "rebase
domain" not rebased themself. We do not want rebased revision above them to be
detached. We want such revision to be rebased on the nearest rebased ancestors.
This allows to preserve the topology of the rebase set as much a possible
To achieve this we introduce a new state `revignored` which informs
`defineparents` of the situation.
The test in `test-rebase-obsolete.t` was actually wrote and his now fixed.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Fri, 18 Jan 2013 23:41:48 +0100 |
parents | 4c94b6d0fb1c |
children | 5c2a4f37eace |
rev | line source |
---|---|
11857
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
1 $ hg init |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
2 $ echo This is file a1 > a |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
3 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11857
diff
changeset
|
4 $ hg commit -m "commit #0" |
11857
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
5 $ ls |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
6 a |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
7 $ echo This is file b1 > b |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
8 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11857
diff
changeset
|
9 $ hg commit -m "commit #1" |
11857
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
10 $ hg co 0 |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
11 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
12 |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
13 B should disappear |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
14 |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
15 $ ls |
9661514f85ae
tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents:
1933
diff
changeset
|
16 a |