Mercurial > hg
annotate tests/test-diff-issue2761.t @ 27027:a01ecbcfaf84
mergestate: handle additional record types specially
This works around a bug in older Mercurial versions' handling of the v2 merge
state.
We also add a bunch of tests that make sure that
(1) we correctly abort when the merge state has an unsupported record type
(2) aborting the merge, rebase or histedit continues to work and clears out the
merge state.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 18 Nov 2015 15:46:45 -0800 |
parents | 73e3e368bd42 |
children | 55c6ebd11cb9 |
rev | line source |
---|---|
13929
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
1 Test issue2761 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
2 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
3 $ hg init |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
4 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
5 $ touch to-be-deleted |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
6 $ hg add |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
7 adding to-be-deleted |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
8 $ hg ci -m first |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
9 $ echo a > to-be-deleted |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
10 $ hg ci -m second |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
11 $ rm to-be-deleted |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
12 $ hg diff -r 0 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
13 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
14 Same issue, different code path |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
15 |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
16 $ hg up -C |
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17486 | 18 $ touch does-not-exist-in-1 |
13929
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
19 $ hg add |
17486 | 20 adding does-not-exist-in-1 |
13929
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
21 $ hg ci -m third |
17486 | 22 $ rm does-not-exist-in-1 |
13929
cff56a0ed18e
localrepo: don't add deleted files to list of modified/added files (issue2761)
Idan Kamara <idankk86@gmail.com>
parents:
diff
changeset
|
23 $ hg diff -r 1 |