So I had recently committed some code, and I wanted to pull in changes from the parent branch. I had heard that "rebase" is a little cleaner then just "merge", so will in my child branch, I "rebased" onto the parent branch. I got a message that said "Base branch is descendant of current branch. Pulling instead.", but then the entire branch when missing. There is no history of it. It's like it rewound, moved to parent branch, but never replayed the commits. Below is the output from my console. janthony-mac:working judahtanthony$ bzr diff === modified file 'drupal/sites/all/modules/ec_subs/ec-subs-mysubscription-norole.tpl.php' --- drupal/sites/all/modules/ec_subs/ec-subs-mysubscription-norole.tpl.php 2011-01-24 22:00:45 +0000 +++ drupal/sites/all/modules/ec_subs/ec-subs-mysubscription-norole.tpl.php 2011-02-15 21:39:03 +0000 @@ -7,4 +7,6 @@

. . . Shorten for security reasons . . . } else { janthony-mac:working judahtanthony$ bzr ci -m "some UX changes and user path changes" Committing to: bzr+ssh://bazaar.launchpad.net/~economist-magic/economist-magic/NY-voucher-redemption/ modified drupal/sites/all/modules/ec_subs/ec-subs-mysubscription-norole.tpl.php modified drupal/sites/all/modules/ec_subs/ec-subs-mysubscription-role.tpl.php modified drupal/sites/all/modules/ec_subs/ec_subs.module modified drupal/sites/all/modules/ec_voucher/ec_voucher.module Committed revision 3458. janthony-mac:working judahtanthony$ bzr st unknown: drupal/drush@ drupal/nbproject/ janthony-mac:working judahtanthony$ bzr info Checkout (format: 2a) Location: checkout root: . checkout of branch: bzr+ssh://bazaar.launchpad.net/~economist-magic/economist-magic/NY-voucher-redemption/ Related branches: submit branch: bzr+ssh://bazaar.launchpad.net/~economist-magic/economist-magic/trunk/ janthony-mac:working judahtanthony$ bzr rebase $LP/user-migration-trunk bzr: ERROR: A rebase operation was interrupted. Continue using 'bzr rebase-continue' or abort using 'bzr rebase-abort' janthony-mac:working judahtanthony$ bzr st unknown: drupal/drush@ drupal/nbproject/ janthony-mac:working judahtanthony$ bzr rebase-abort janthony-mac:working judahtanthony$ bzr st unknown: drupal/drush@ drupal/nbproject/ janthony-mac:working judahtanthony$ bzr rebase $LP/user-migration-trunk Base branch is descendant of current branch. Pulling instead. All changes applied successfully. janthony-mac:working judahtanthony$ bzr st unknown: drupal/drush@ drupal/nbproject/ janthony-mac:working judahtanthony$ bzr diff --old $LP/user-migration-trunk --new $LP/NY-voucher-redemption janthony-mac:working judahtanthony$ bzr info Checkout (format: 2a) Location: checkout root: . checkout of branch: bzr+ssh://bazaar.launchpad.net/~economist-magic/economist-magic/NY-voucher-redemption/ Related branches: submit branch: bzr+ssh://bazaar.launchpad.net/~economist-magic/economist-magic/trunk/

When	Who	Action	New State
2011-02-16	Max Bowsher	Answer	Answered
2011-02-16	Max Bowsher	Comment	Answered

Ubuntubzr-rebase package

History of question #145535

Ubuntu
bzr-rebase package