Mercurial > hg
annotate tests/test-debugrename.t @ 26730:a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Very often in my life I'm finding that the only configured merge tool
present on the system is vimdiff[0], and it's currently impossible (as
far as I can tell) short of specifying `ui.merge = `[1] to actually
*disable* a merge tool. This allows vimdiff-haters to put:
[merge-tools]
vimdiff.disable = yes
in their ~/.hgrc and never see vimdiff again. I'm stopping short of
putting this as a commented out entry in the sample new user hgrc
(seen when a user runs `hg config --edit` with no ~/.hgrc) for now,
but I might come back and do that later.
0: vimdiff is at an awkward intersection: it's usually installed by
the vim package which is often installed as a vi substitute, so it's
mere presence doesn't imply me wanting it, unlike (say) kdiff3.
1: There's a related problem I ran into today where specifying
`ui.merge = :merge` failed because :merge isn't a command, which I
think is a regression. I'll try and figure that out and at least file
a bug.
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 14 Oct 2015 12:57:33 -0400 |
parents | 5d9bc49b0b1e |
children | 55c6ebd11cb9 |
rev | line source |
---|---|
12285
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
1 $ hg init |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
2 $ echo a > a |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
3 $ hg ci -Am t |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
4 adding a |
4637 | 5 |
12285
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
6 $ hg mv a b |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
7 $ hg ci -Am t1 |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
8 $ hg debugrename b |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
9 b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
4637 | 10 |
12285
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
11 $ hg mv b a |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
12 $ hg ci -Am t2 |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
13 $ hg debugrename a |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
14 a renamed from b:37d9b5d994eab34eda9c16b195ace52c7b129980 |
4637 | 15 |
12285
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
16 $ hg debugrename --rev 1 b |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
17 b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
4637 | 18 |