D5961: copies: add test that makes both the merging csets dirty and run w/o error

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Sat Mar 9 14:49:51 EST 2019


martinvonz accepted this revision.
martinvonz added inline comments.
This revision is now accepted and ready to land.

INLINE COMMENTS

> test-copies.t:541
> +  $ hg up 2 -q
> +  $ hg graft -r 4 --base 3 --hidden
> +  grafting 4:af28412ec03c "added d, modified b" (tip)

Interesting, I wasn't aware about the `--base` option. That seems like a useful tool for various workarounds. I'll try to remember it.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5961

To: khanchi97, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-devel


More information about the Mercurial-devel mailing list