Mercurial > hg

annotate tests/test-debugrename.t @ 27027:a01ecbcfaf84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5d9bc49b0b1e
children 55c6ebd11cb9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
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
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
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
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
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
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
18