D8242: copies-tests: add a case where with merge with an overwritten files

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Fri Mar 6 18:26:00 UTC 2020


martinvonz added inline comments.

INLINE COMMENTS

> test-copies-chain-merge.t:411
> +  created new head
> +  $ hg log -G --rev '::(desc("mGFm")+desc("mGFm"))'
> +  @    29 mGFm-0 simple merge - the other way]

one of them should be "mFGm"

> test-copies-chain-merge.t:412
> +  $ hg log -G --rev '::(desc("mGFm")+desc("mGFm"))'
> +  @    29 mGFm-0 simple merge - the other way]
> +  |\

just out of curiosity, what does the trailing "]" you put in the template indicate?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8242/new/

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

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


More information about the Mercurial-devel mailing list