[Bug 5678] New: Phase of public revisions reset to draft after rebasing a draft rev. on top of the public head

[mercurial-bugs at mercurial-scm.org]

https://bz.mercurial-scm.org/show_bug.cgi?id=5678

            Bug ID: 5678
           Summary: Phase of public revisions reset to draft after
                    rebasing a draft rev. on top of the public head
           Product: Mercurial
           Version: 4.3
          Hardware: Macintosh
                OS: Mac OS
            Status: UNCONFIRMED
          Keywords: regression
          Severity: bug
          Priority: urgent
         Component: rebase
          Assignee: bugzilla at mercurial-scm.org
          Reporter: mmn100+selenic at gmail.com
                CC: gregory.szorc at gmail.com,
                    mercurial-devel at mercurial-scm.org

STR:

$ hg log --graph --rev=wip --template "{rev} {phase} {firstline(desc)}\n"
> o  380545 public This is the public head
> :
> : @  380260 draft This is my draft commit
> :/
> o  380259 public This is the 2nd-last public commit
> |
> ~

$ hg rebase -s 380260 -d 380545
> rebasing 380260:7bf1ca063893 "This is my draft commit"
> saved backup bundle to /Users/…/mozilla-central2/.hg/strip-backup/7bf1ca063893-565e6f60-rebase.hg


Expected result:

I can get to this state by doing a `hg pull` which seems to fix the phase info.

$ hg log --graph --rev=wip --template "{rev} {phase} {firstline(desc)}\n"
> @  380545 draft This is my draft commit
> |
> o  380544 public This is the public head
> |
> ~

Actual result: 

Note that revs that were previously public are now draft:

$ hg log --graph --rev=wip --template "{rev} {phase} {firstline(desc)}\n"       
> @  380545 draft This is my draft commit
> |
> o  380544 draft This is the public head
> |
> o  380543 draft This is the 2nd-last public commit
> |
> o    380542 draft merge autoland to mozilla-central. r=merge a=merge
> |\
> | ~
> o  380541 draft Bug 1397717 - Using GenericPrinter for DEBUG-only C++ dump() APIs;r=nbp
> |
> o  380540 draft Bug 1397141 - part8 : update test for video under 48x48. r=jya
> |
> o  380539 draft Bug 1397141 - part7 : update error description in MFR. r=jya
> |
> o  380538 draft Bug 1397141 - part6 : use MediaResult to replace nsresult r=jya
> |
> ~

My coworker can also reproduce this with 4.3.1

Mercurial Distributed SCM (version 4.3.1)

-- 
You are receiving this mail because:
You are on the CC list for the bug.