Mercurial > public > mercurial-scm > hg-stable

view tests/test-dirstate-backup.t @ 48607:07069fcd9a6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: work with `simplemerge.MergeInput` in `filemerge()` We currently pass around pairs of file context objects and labels between functions in the `filemerge` module. I plan to pass around `simplemerge.MergeInput` instead. This patch prepares for that by using the type internally in `filemerge.filemerge()`. Differential Revision: https://phab.mercurial-scm.org/D12017
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 20 Jan 2022 14:42:50 -0800
parents 8d72e29ad1e0
children ffd19d73518d
line wrap: on
line source

Set up

  $ hg init repo
  $ cd repo

Try to import an empty patch

  $ hg import --no-commit - <<EOF
  > EOF
  applying patch from stdin
  abort: stdin: no diffs found
  [10]

No dirstate backups are left behind

  $ ls .hg/dirstate* | sort
  .hg/dirstate