tests/test-diff-issue2761.t
author Matthieu Laneuville <matthieu.laneuville@octobus.net>
Fri, 08 Dec 2017 16:54:59 +0900
changeset 35311 12ce62c72c24
parent 17486 73e3e368bd42
child 49621 55c6ebd11cb9
permissions -rw-r--r--
patch: catch unexpected case in _inlinediff If operation is neither 'diff.inserted' or 'diff.deleted', label and token won't be define. This patch explicitely catches that exception.

Test issue2761

  $ hg init

  $ touch to-be-deleted
  $ hg add
  adding to-be-deleted
  $ hg ci -m first
  $ echo a > to-be-deleted
  $ hg ci -m second
  $ rm to-be-deleted
  $ hg diff -r 0

Same issue, different code path

  $ hg up -C
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ touch does-not-exist-in-1
  $ hg add
  adding does-not-exist-in-1
  $ hg ci -m third
  $ rm does-not-exist-in-1
  $ hg diff -r 1