tests/test-issue1089.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Fri, 28 Jan 2022 17:08:30 +0100
changeset 48725 9bc86adf32f6
parent 35400 4441705b7111
child 49585 55c6ebd11cb9
permissions -rw-r--r--
merge-actions: make merge action a full featured object This open the way for having "smarter" value as action, making the usage code simpler and more flexible. We have to explicitly use __bytes__ call in a couple of place because Python2… Differential Revision: https://phab.mercurial-scm.org/D12114

https://bz.mercurial-scm.org/1089

  $ hg init
  $ mkdir a
  $ echo a > a/b
  $ hg ci -Am m
  adding a/b

  $ hg rm a
  removing a/b
  $ hg ci -m m a

  $ mkdir a b
  $ echo a > a/b
  $ hg ci -Am m
  adding a/b

  $ hg rm a
  removing a/b
  $ cd b

Relative delete:

  $ hg ci -m m ../a

  $ cd ..