[Bug 5123] New: unshelve loses merge parents

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Tue Mar 1 01:57:49 EST 2016


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

            Bug ID: 5123
           Summary: unshelve loses merge parents
           Product: Mercurial
           Version: 3.7.1
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: shelve
          Assignee: bugzilla at selenic.com
          Reporter: timeless at gmail.com
                CC: mercurial-devel at selenic.com

I'm playing w/ blackbox logging.

$ touch a
2016/03/01 05:24:49 timeless @0000000000000000000000000000000000000000+
(103381)> add a
2016/03/01 05:24:49 timeless @0000000000000000000000000000000000000000+
(103439)> commit -m a
2016/03/01 05:24:53 timeless @d987a3293a8534106053f7a671399ce5f62d02df
(104523)> co null
$ touch b
2016/03/01 05:25:07 timeless @0000000000000000000000000000000000000000+
(108970)> add b
2016/03/01 05:25:07 timeless @0000000000000000000000000000000000000000+
(109020)> commit -m b
2016/03/01 05:25:13 timeless @620d608a01f80b776d8f7579d905d5449e208ef3
(111542)> log -G
2016/03/01 05:25:19 timeless @620d608a01f80b776d8f7579d905d5449e208ef3+
(114903)> add c
2016/03/01 06:52:09 timeless @620d608a01f80b776d8f7579d905d5449e208ef3+ (17205)
[command]> shelve
2016/03/01 06:47:36 timeless @620d608a01f80b776d8f7579d905d5449e208ef3 (163745)
[command]> co 1
2016/03/01 06:47:38 timeless @620d608a01f80b776d8f7579d905d5449e208ef3 (1320)
[command]> merge 0
$ # here I had a happy merge with two parents
2016/03/01 06:47:38 timeless
@620d608a01f80b776d8f7579d905d5449e208ef3+d987a3293a8534106053f7a671399ce5f62d02df+
(1320) [commandfinish]> merge 0 exited 0 after 0.19 seconds
2016/03/01 06:47:45 timeless
@620d608a01f80b776d8f7579d905d5449e208ef3+d987a3293a8534106053f7a671399ce5f62d02df+
(2053) [command]> log -G
$ # and I was trying to pull in the shelve bits
2016/03/01 06:47:49 timeless
@620d608a01f80b776d8f7579d905d5449e208ef3+d987a3293a8534106053f7a671399ce5f62d02df+
(2350) [command]> unshelve
$ # except it ate my second parent.
2016/03/01 06:47:50 timeless @620d608a01f80b776d8f7579d905d5449e208ef3 (2350)
[commandfinish]> unshelve exited 0 after 0.34 seconds
2016/03/01 06:47:52 timeless @620d608a01f80b776d8f7579d905d5449e208ef3 (2514)
[command]> log -G

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


More information about the Mercurial-devel mailing list