[issue1950] Rebase creates unexpected merge changeset

[Martin Geisler]

New submission from Martin Geisler <mg at lazybytes.net>:

Starting with:

@  changeset:   6:7e2bf3799ef3
|  branch:      release-v2
|  tag:         tip
|  user:        Martin Geisler <mg at lazybytes.net>
|  date:        Sun Dec 13 00:50:43 2009 +0100
|  summary:     Hacking on v2
|
o  changeset:   5:e02960e54523
|  branch:      release-v2
|  parent:      0:bd20cb5b4d7b
|  user:        Martin Geisler <mg at lazybytes.net>
|  date:        Sun Dec 13 00:50:43 2009 +0100
|  summary:     Started release-v2 branch
|
| o  changeset:   4:afdcb179875a
| |  branch:      customer
| |  user:        Martin Geisler <mg at lazybytes.net>
| |  date:        Sun Dec 13 00:50:43 2009 +0100
| |  summary:     Hacking on customer
| |
| o  changeset:   3:eec2d154a6ed
| |  branch:      customer
| |  user:        Martin Geisler <mg at lazybytes.net>
| |  date:        Sun Dec 13 00:50:43 2009 +0100
| |  summary:     Started customer branch
| |
| o  changeset:   2:fc1b7ce61a62
| |  branch:      release-v1
| |  user:        Martin Geisler <mg at lazybytes.net>
| |  date:        Sun Dec 13 00:50:42 2009 +0100
| |  summary:     Hacking on v1
| |
| o  changeset:   1:5aeaf6982776
|/   branch:      release-v1
|    user:        Martin Geisler <mg at lazybytes.net>
|    date:        Sun Dec 13 00:50:42 2009 +0100
|    summary:     Started release-v1 branch
|
o  changeset:   0:bd20cb5b4d7b
   user:        Martin Geisler <mg at lazybytes.net>
   date:        Sun Dec 13 00:50:42 2009 +0100
   summary:     Hacking on default


doing "hg rebase --keepbranches -s 3" gives me


@  changeset:   6:0da6659a9cf4
|  branch:      customer
|  tag:         tip
|  user:        Martin Geisler <mg at lazybytes.net>
|  date:        Sun Dec 13 00:50:43 2009 +0100
|  summary:     Hacking on customer
|
o    changeset:   5:5604d2979036
|\   branch:      customer
| |  parent:      4:7e2bf3799ef3
| |  parent:      2:fc1b7ce61a62
| |  user:        Martin Geisler <mg at lazybytes.net>
| |  date:        Sun Dec 13 00:50:43 2009 +0100
| |  summary:     Started customer branch
| |
| o  changeset:   4:7e2bf3799ef3
| |  branch:      release-v2
| |  user:        Martin Geisler <mg at lazybytes.net>
| |  date:        Sun Dec 13 00:50:43 2009 +0100
| |  summary:     Hacking on v2
| |
| o  changeset:   3:e02960e54523
| |  branch:      release-v2
| |  parent:      0:bd20cb5b4d7b
| |  user:        Martin Geisler <mg at lazybytes.net>
| |  date:        Sun Dec 13 00:50:43 2009 +0100
| |  summary:     Started release-v2 branch
| |
o |  changeset:   2:fc1b7ce61a62
| |  branch:      release-v1
| |  user:        Martin Geisler <mg at lazybytes.net>
| |  date:        Sun Dec 13 00:50:42 2009 +0100
| |  summary:     Hacking on v1
| |
o |  changeset:   1:5aeaf6982776
|/   branch:      release-v1
|    user:        Martin Geisler <mg at lazybytes.net>
|    date:        Sun Dec 13 00:50:42 2009 +0100
|    summary:     Started release-v1 branch
|
o  changeset:   0:bd20cb5b4d7b
   user:        Martin Geisler <mg at lazybytes.net>
   date:        Sun Dec 13 00:50:42 2009 +0100
   summary:     Hacking on default

I did not expect to get a merge changeset out of this? Instead I wanted the
two changesets from the "customer" branch to move from "release-v1" to
"release-v2".

I've attached the test script.

----------
files: script.sh
messages: 11223
nosy: mg
priority: bug
status: unread
title: Rebase creates unexpected merge changeset

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue1950>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: script.sh
Type: application/x-sh
Size: 527 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20091212/d7ea6b89/attachment.sh>