bzr merge --pull --preview BRANCH does not always honor the --preview option

Bug #760152 reported by Denys Duchier on 2011-04-13
10
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
High
John A Meinel
2.3
High
John A Meinel
bzr (Ubuntu)
Undecided
Unassigned
Natty
High
Jelmer Vernooij

Bug Description

when the BRANCH can be pulled, then this is done unconditionally even when the --preview option was given.

Related branches

Denys Duchier (denys.duchier) wrote :

here is a proposed patch

Martin Pool (mbp) on 2011-04-20
Changed in bzr:
status: New → In Progress
importance: Undecided → High
assignee: nobody → canonical-bazaar (canonical-bazaar)
John A Meinel (jameinel) on 2011-04-20
Changed in bzr:
assignee: canonical-bazaar (canonical-bazaar) → John A Meinel (jameinel)
John A Meinel (jameinel) wrote :

Fixed differently in the associated branch. Just added a "if pull and not preview:" check, and a test.

The patch is written against 2.1, but I merged 2.3 to do the Release Notes update. If we want, it is trivial to "backport" this to the 2.1 series.

John A Meinel (jameinel) wrote :

Still needs to be merged-up from the 2.3 branch, but otherwise has landed.

Changed in bzr:
milestone: none → 2.4b2
Vincent Ladeuil (vila) on 2011-04-28
Changed in bzr:
status: In Progress → Fix Released
Jelmer Vernooij (jelmer) on 2011-06-08
Changed in bzr (Ubuntu):
status: New → Fix Released
Jelmer Vernooij (jelmer) on 2011-06-08
Changed in bzr (Ubuntu Natty):
status: New → In Progress
Jelmer Vernooij (jelmer) on 2011-06-10
Changed in bzr (Ubuntu Natty):
importance: Undecided → High
assignee: nobody → Jelmer Vernooij (jelmer)

Accepted bzr into natty-proposed, the package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

Changed in bzr (Ubuntu Natty):
status: In Progress → Fix Committed
tags: added: verification-needed
Clint Byrum (clint-fewbar) wrote :

Hello Denys, or anyone else affected,

Accepted bzr into natty-proposed, the package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

Jelmer Vernooij (jelmer) wrote :

Verified by running the bzr testsuite from the package in a clean natty install.

tags: added: verification-done
removed: verification-needed
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package bzr - 2.3.4-0ubuntu1

---------------
bzr (2.3.4-0ubuntu1) natty-proposed; urgency=low

  * New upstream release.
   + Fix bzr version number in deprecation warnings. LP: #794960
   + Prevent write attemps on remote branch during "bzr up". LP: #786980
   + Fix conflict handling when two trees involved in a merge have different
     root ids. LP: #805809

bzr (2.3.3-0ubuntu1) natty-proposed; urgency=low

  * New upstream release.
   + Fixes deprecation warning on newer versions of Python. LP: #760435
   + Stops 'bzr push' from copying entire repository if a .bzr directory is
     present without a branch. LP: #465517
   + Fixes undefined local variable error when waiting for lock. LP: #733136
   + Fixes lock contention issues pushing to a bound branch. LP: #733350
   + Transfers less data creating a new stacked branch. LP: #737234
   + Several fixes to the test suite, making it more robust. LP: #654733,
      LP: #751824
   + 'bzr merge --pull --preview' actually shows a preview rather than
     actually merging. LP: #760152
   + bzr smart server now supports UTF-8 user names. LP: #659763
   + user identity can now be set based on username and /etc/mailname, not
     requiring it to be set manually. LP: #616878
   + stacking is now fully transitive. LP: #715000
   + makes in-terminal crash report of plugins much shorter. LP: #716389
 -- Jelmer Vernooij <email address hidden> Thu, 14 Jul 2011 21:12:58 +0200

Changed in bzr (Ubuntu Natty):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers