[PATCH 3 of 5] rebase: use scmutil.cleanupnodes (issue5606) (BC)

Jun Wu quark at fb.com
Thu Jul 6 00:50:12 UTC 2017


Excerpts from Martin von Zweigbergk's message of 2017-07-05 16:27:25 -0700:
> > @@ -269,6 +269,4 @@ Check that the right ancestors is used w
> >    rebased as 2a7f09cac94c
> >    rebase merging completed
> > -  rebase status stored
> > -  updating the branch cache
> >    update back to initial working directory parent
> >    resolving manifests
> > @@ -279,4 +277,6 @@ Check that the right ancestors is used w
> >     f2.txt: remote created -> g
> >    getting f2.txt
> > +  rebase completed
> > +  updating the branch cache
> >    2 changesets found
> >    list of changesets:
> 
> The reason for the two hunks above is not clear to me. Could you explain?

This is because rbsrt._finishrebase is moved inside the transaction so:

  1. rebase completed earlier. transaction closes later.
  2. no need to write rebase status during tr.close() (with 2312e70cf7,
     _finishrebase removes the file generator from tr)



More information about the Mercurial-devel mailing list