merge degrades to pull in an empty branch from bzr 0.10 on

Bug #56663 reported by Robert Collins
10
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Wishlist
Unassigned

Bug Description

In bzr 0.10 we are changing the tree model to not record 'None' as a
last revision if there are pending merges - instead the left most merge
will become the last revision. This means that
'bzr init'
'bzr merge'

will behave the same as
'bzr init'
'bzr pull'

The long term fix is probably to have new trees have an explicit first
parent of 'empty:', but that its ok to do that later.

 affects /products/bzr

--
GPG key available at: <http://www.robertcollins.net/keys.txt>.

Revision history for this message
John A Meinel (jameinel) wrote :

It doesn't seem strictly necessary to support 'bzr init; bzr merge'. But if we decide it is an important use case, we can re-prioritize this bug.

Changed in bzr:
importance: Undecided → Wishlist
status: Unconfirmed → Confirmed
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.