[issue1511] Rebase of partial (unnamed) branch resulted in unexpected behavior

Andrew Beekhof mercurial-bugs at selenic.com
Thu Feb 12 05:57:34 CST 2009


New submission from Andrew Beekhof <abeekhof at suse.de>:

As discussed on IRC (the conclusion being that the result is probably not correct)...

# hg --version
Mercurial Distributed SCM (version 44b3f7bbe2f3+20090117)

Original repository

@  abeekhof (whitetank)	ipc-24 from upstream mailing list CS: 71328d5542a6 On: 2009-02-12
|
o  abeekhof (whitetank)	Reorder to allow ipc patches to cleanly apply CS: 4036e595ae59 On: 2009-02-12
|
o  abeekhof (whitetank)	Revert change as it is included in the IPC patches CS: ad315e440042 On: 2009-02-12
|
| o  abeekhof (whitetank)	Bug BNC:473901 - Do bounds checking to prevent crash in IPC code CS: 08c54232e58d On: 2009-02-12
| |
| o  abeekhof (whitetank)	Resolve the differences between the desired result and that produced by hg rebase CS: f1c519a42d16 On: 2009-02-10
| |
| o  abeekhof (whitetank)	Fix shared libary installation (new so number) CS: aef81cde9fc9 On: 2009-02-09
| |
| o  abeekhof (whitetank)	Increase the library version numbers for the IPC changes CS: 22190f0819c8 On: 2009-02-09
| |
| o  abeekhof (whitetank)	Mailing list patch for bnc:470118 CS: 0e39b5a40403 On: 2009-02-08
| |
| o  abeekhof (whitetank)	Remove debug messages CS: c8b1e181602e On: 2009-02-08
| |
| o  abeekhof (whitetank)	Add the new ipc functions to libSaMsg.versions CS: 788ff88116bc On: 2009-02-06
| |
| o  abeekhof (whitetank)	ipc-20 from upstream mailing list CS: 2ab43be41620 On: 2009-02-06
|/
o  abeekhof (whitetank)	Fix for crash in BNC:470118 via upstream list CS: 09edbef89566 On: 2009-02-06
|

Result after hg rebase -s c8b1e181602e -d 71328d5542a6
In the expected result, 788ff88116bc would not be a parent of a5ccc1dee93a 

@  abeekhof (whitetank)	Bug BNC:473901 - Do bounds checking to prevent crash in IPC code CS: 354bd3f09bb2 On: 2009-02-12
|
o  abeekhof (whitetank)	Resolve the differences between the desired result and that produced by hg rebase CS: 593c2553f609 On: 2009-02-10
|
o  abeekhof (whitetank)	Fix shared libary installation (new so number) CS: 603ade310dfa On: 2009-02-09
|
o  abeekhof (whitetank)	Increase the library version numbers for the IPC changes CS: 9e9485b9ae02 On: 2009-02-09
|
o  abeekhof (whitetank)	Mailing list patch for bnc:470118 CS: 59c3c18bc252 On: 2009-02-08
|
o    abeekhof (whitetank)	Remove debug messages CS: a5ccc1dee93a On: 2009-02-08
|\
| o  abeekhof (whitetank)	ipc-24 from upstream mailing list CS: 71328d5542a6 On: 2009-02-12
| |
| o  abeekhof (whitetank)	Reorder to allow ipc patches to cleanly apply CS: 4036e595ae59 On: 2009-02-12
| |
| o  abeekhof (whitetank)	Revert change as it is included in the IPC patches CS: ad315e440042 On: 2009-02-12
| |
o |  abeekhof (whitetank)	Add the new ipc functions to libSaMsg.versions CS: 788ff88116bc On: 2009-02-06
| |
o |  abeekhof (whitetank)	ipc-20 from upstream mailing list CS: 2ab43be41620 On: 2009-02-06
|/
o  abeekhof (whitetank)	Fix for crash in BNC:470118 via upstream list CS: 09edbef89566 On: 2009-02-06
|

----------
messages: 8590
nosy: astratto, beekhof, djc
priority: bug
status: unread
title: Rebase of partial (unnamed) branch resulted in unexpected behavior

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1511>
____________________________________________________



More information about the Mercurial-devel mailing list