D5962: copies: add test that makes both the merging csets dirty and fails

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Mon Mar 11 02:42:26 EDT 2019


martinvonz added inline comments.

INLINE COMMENTS

> test-copies.t:575
> +
> +  $ hg log -G -T '{rev} : {node|short}   {desc} \n{phase}\n'
> +  @  3 : 9a8bb7cc6814   added c

As in the previous patch, I'd like to avoid hashes in the output by using `hg l`.

> test-copies.t:608
> +
> +  $ hg rebase -r . -d 2
> +  rebasing 5:5018b1509e94 "added willconflict and d" (tip)

You can use `-t :other` here and not have to manually resolve it

REPOSITORY
  rHG Mercurial

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

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


More information about the Mercurial-devel mailing list