This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5c25fe7fb1e6: rebase: do not update if IMM; instead, set
the overlaywctxs parents (authored by phillco, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
phillco added inline comments.
INLINE COMMENTS
> dlax wrote in rebase.py:1003
> `wctx` has a default value of `None`, so either it shouldn't have that or
> there should be a check for `None` here.
Good point -- dropped.
> dlax wrote in rebase.py:1007
> `wctx` is redefined here.
This is
phillco updated this revision to Diff 4259.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1246?vs=4211=4259
REVISION DETAIL
https://phab.mercurial-scm.org/D1246
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py
dlax requested changes to this revision.
dlax added a comment.
This revision now requires changes to proceed.
Needs test.
INLINE COMMENTS
> rebase.py:1003
> # Update to destination and merge it with local
> -if repo['.'].rev() != p1:
> -repo.ui.debug(" update to %d:%s\n" %
phillco updated this revision to Diff 4211.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1246?vs=4192=4211
REVISION DETAIL
https://phab.mercurial-scm.org/D1246
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py
phillco updated this revision to Diff 4192.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1246?vs=3119=4192
REVISION DETAIL
https://phab.mercurial-scm.org/D1246
