bzr merge --pull --preview BRANCH does not always honor the --preview option
Bug #760152 reported by
Denys Duchier
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
John A Meinel | ||
2.3 |
Fix Released
|
High
|
John A Meinel | ||
bzr (Ubuntu) |
Fix Released
|
Undecided
|
Unassigned | ||
Natty |
Fix Released
|
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
lp:~jameinel/bzr/preview-pull-760152
- Jelmer Vernooij (community): Approve
-
Diff: 81 lines (+25/-3)3 files modifiedbzrlib/builtins.py (+1/-1)
bzrlib/tests/blackbox/test_merge.py (+20/-2)
doc/en/release-notes/bzr-2.3.txt (+4/-0)
Changed in bzr: | |
status: | New → In Progress |
importance: | Undecided → High |
assignee: | nobody → canonical-bazaar (canonical-bazaar) |
Changed in bzr: | |
assignee: | canonical-bazaar (canonical-bazaar) → John A Meinel (jameinel) |
Changed in bzr: | |
status: | In Progress → Fix Released |
Changed in bzr (Ubuntu): | |
status: | New → Fix Released |
Changed in bzr (Ubuntu Natty): | |
status: | New → In Progress |
Changed in bzr (Ubuntu Natty): | |
importance: | Undecided → High |
assignee: | nobody → Jelmer Vernooij (jelmer) |
To post a comment you must log in.
here is a proposed patch