tests/test-debugrename.t
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 07 Feb 2022 22:54:38 -0800
changeset 48760 93d6f0e7ba2f
parent 12285 5d9bc49b0b1e
child 49621 55c6ebd11cb9
permissions -rw-r--r--
filemerge: move check for identical sides out of filemerge() `filemerge.filemerge()` returns `None` if no merge was necessary because the two sides were identical. I don't think it should be that function's responsibility to handle that case; we should ideally not even call `filemerge.filemerge()` if the two inputs identical. This patch therefore moves the check out to the caller (`mergestate.py`). The largefiles test changed because we now notice that the two sides made the same change, so we don't consider it a merge. Also note that the new message better matches the line above it in the test output. Differential Revision: https://phab.mercurial-scm.org/D12154
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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