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

[Sushil Khanchi]

@martinvonz updated this one too.

On Mon, Feb 25, 2019 at 11:01 PM martinvonz (Martin von Zweigbergk) <
phabricator at mercurial-scm.org> wrote:

> martinvonz added inline comments.
>
> INLINE COMMENTS
>
> > test-copytrace-heuristics.t:931-980
> > +  $ hg graft -r 6 --base c9241b0f2d5b --hidden
> > +  grafting 6:99802e4f1e46 "added willconflict and d" (tip)
> > +  ** unknown exception encountered, please report by visiting
> > +  ** https://mercurial-scm.org/wiki/BugTracker
> > +  ** Python 2.7.12 (default, Nov 12 2018, 14:36:49) [GCC 5.4.0 20160609]
> > +  ** Mercurial Distributed SCM (version 4.8.1+539-b6c610bf567e+20181221)
> > +  ** Extensions loaded: rebase, shelve
>
> nit: we usually redirect stderr and grep for the error (`AssertionError`
> here) to make it a bit shorter. (besides, the test here with
> `/home/khanchi/` paths is clearly not going to pass on most people's
> machines)
>
> REPOSITORY
>   rHG Mercurial
>
> REVISION DETAIL
>   https://phab.mercurial-scm.org/D5962
>
> To: khanchi97, #hg-reviewers
> Cc: martinvonz, mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20190227/8164cbf3/attachment.html>