Mercurial > hg
annotate tests/test-extra-filelog-entry.t @ 45587:768412472663
merge: store cases when a file is absent post merge in commitinfo
Some merges can result in file being absent form working directory. This can be
one of file was kept deleted or file was removed by merge code.
User might revert the file back before committing. In such cases we will like to
have better handling and create new filenodes.
We store this info in mergestate as commitinfo so that we can use it while
committing to create new filenode if required.
Differential Revision: https://phab.mercurial-scm.org/D9003
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 24 Aug 2020 15:35:34 +0530 |
parents | d4e62df1c73d |
children | ccd76e292be5 |
rev | line source |
---|---|
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12328
diff
changeset
|
1 Issue351: mq: qrefresh can create extra revlog entry |
4531
b51a8138292a
Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
12305
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
3 $ echo "[extensions]" >> $HGRCPATH |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
4 $ echo "mq=" >> $HGRCPATH |
4531
b51a8138292a
Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
12305
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
6 $ hg init |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
7 $ hg qinit |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
8 |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
9 $ echo b > b |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
10 $ hg ci -A -m foo |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
11 adding b |
4531
b51a8138292a
Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 |
12305
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
13 $ echo cc > b |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
14 $ hg qnew -f foo.diff |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
15 $ echo b > b |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
16 $ hg qrefresh |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
17 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12399
diff
changeset
|
18 $ hg debugindex b |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
19 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
20 0 0 1e88685f5dde 000000000000 000000000000 |
12305
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
21 |