Mercurial > hg
annotate tests/test-extra-filelog-entry.t @ 38952:0e58c5b20745
mergetool: warn if ui.merge points to nonexistent tool
This adds a warning when ui.merge is configured but points to an
executable that doesn't exist. It gets printed once per fail, but that
seems to be how our other warnings about merge tools are reported.
Differential Revision: https://phab.mercurial-scm.org/D3975
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 23 Jul 2018 22:51:53 -0700 |
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 |