view tests/test-dirstate-backup.t @ 38155:5736570718fe

graft: drop --user and --date values info from hint in case of conflicts After previous patch, we have started preserving user and date values in graftstate and reusing them during `hg graft --continue`. Now passing --user and --date again with --continue makes no sense. Let's drop them from the hint. Differential Revision: https://phab.mercurial-scm.org/D3660
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 26 May 2018 02:11:09 +0530
parents c2b30348930f
children 8d72e29ad1e0
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
  [255]

No dirstate backups are left behind

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