merge with a merge directive in a lightweight checkout from a bzr+ssh:// branch fails

Bug #793783 reported by Benoit Pierre
This bug affects 1 person
Affects Status Importance Assigned to Milestone

Bug Description

Create a repository containing a main branch, a derived feature branch:

bzr init-repository repo1
bzr init repo1/b1
echo foo >repo1/b1/f1
bzr add repo1/b1/f1
bzr commit repo1/b1/f1 -m 1
bzr branch repo1/b1 repo1/b2
echo bar>repo1/b2/f1
bzr commit repo1/b2/f1 -m 2

Create a merge directive for delivering the feature branch:

bzr send -o 2.patch -f repo1/b2 repo1/b1

Create another repository with a copy of the main branch and merge in a local
lightweight checkout:

bzr init-repository repo2
bzr branch repo1/b1 repo2/b1
bzr co --lightweight repo2/b1 checkout1
(cd checkout1 && bzr merge ../2.patch)

=> works fine: all changes applied successfully.

Now do the same using using a lightweight checkout through bzr+ssh:

bzr init-repository repo3
bzr branch repo1/b1 repo3/b1
bzr co --lightweight bzr+ssh://localhost/$PWD/repo3/b1 checkout2
(cd checkout2 && bzr merge ../2.patch)

=> bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.

Try a second time:

(cd checkout2 && bzr merge ../2.patch)

=> it works!

description: updated
Revision history for this message
Andrew Bennetts (spiv) wrote :

Wow, weird.

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

Other bug subscribers

Remote bug watches

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