martinvonz added a comment.
In https://phab.mercurial-scm.org/D5410#87526, @pulkit wrote:
> In https://phab.mercurial-scm.org/D5410#85244, @martinvonz wrote:
>
> > In https://phab.mercurial-scm.org/D5410#85232, @pulkit wrote:
> >
> > > In
pulkit added a comment.
In https://phab.mercurial-scm.org/D5410#85244, @martinvonz wrote:
> In https://phab.mercurial-scm.org/D5410#85232, @pulkit wrote:
>
> > In https://phab.mercurial-scm.org/D5410#80207, @martinvonz wrote:
> >
> > > I'm pretty sure this doesn't actually perform
martinvonz added a comment.
In https://phab.mercurial-scm.org/D5410#85232, @pulkit wrote:
> In https://phab.mercurial-scm.org/D5410#80207, @martinvonz wrote:
>
> > I'm pretty sure this doesn't actually perform the merge, it just drops
the changes outside the narrowspec. On commit, we
pulkit added a comment.
In https://phab.mercurial-scm.org/D5410#80207, @martinvonz wrote:
> I'm pretty sure this doesn't actually perform the merge, it just drops the
changes outside the narrowspec. On commit, we need to record that outside/ has
the new nodeid that we got from the side
martinvonz requested changes to this revision.
martinvonz added a comment.
This revision now requires changes to proceed.
I'm pretty sure this doesn't actually perform the merge, it just drops the
changes outside the narrowspec. On commit, we need to record that outside/ has
the new nodeid
pulkit added a subscriber: martinvonz.
pulkit added a comment.
I am dubiuos that my fix is correct. I went through the history and didn't
find any explanation why we don't allow merging non-conflicting changes outside
narrowspec except TODO's. @martinvonz do you know why we don't allow
pulkit created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch allows merging of non-conflicting changes outside narrowspec.
REPOSITORY
rHG Mercurial
REVISION DETAIL
