QBzr

qbzr and bzr-pipeline not compatible.

Bug #395817 reported by Gary van der Merwe
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
QBzr
Fix Released
High
Alexander Belchenko
QBzr 0.14 "Eucalyptus"
bzr-pipeline
Fix Released
Low
Unassigned

Bug Description

Tim Penhey wrote on his blog:
Unfortunately this(bzr-pipeline) seemed to clash slightly with the QBzr plugin. The were both trying to redefine merge. Personally I don't use QBzr and had probably just installed it to take a look, so I removed that plugin.

We should try find a way to make it possible to have both bzr-pipeline at the same time.

Related branches

lp:~garyvdm/bzr-pipeline/decoratemerge
On hold for merging into lp:bzr-pipeline
Aaron Bentley: Needs Fixing
Diff: None lines
Gary van der Merwe (garyvdm)
Changed in qbzr:
importance: Undecided → Medium
Revision history for this message
Alexander Belchenko (bialix) wrote :

Well, actually it will be better to just remove qbzr overload from std merge command and add qpreview feature to qmerge command. I don't think many people using it.

Aaron Bentley (abentley)
Changed in bzr-pipeline:
importance: Undecided → Low
status: New → Triaged
Alexander Belchenko (bialix)
summary: - qbzr and bzr-pipeline not compatable.
+ qbzr and bzr-pipeline not compatible.
Revision history for this message
Alexander Belchenko (bialix) wrote :

So after chatting with Gary and Lukas the consensus re qbzr's merge --qpreview is:

* teach bzrlib merge about `merge --preview --using XXX` where XXX could be qbzr
* this would require to support `bzr diff --using qbzr` too.

Also we need "qpreview" option in qmerge in similar way to Diff button in several other dialogs (qlog/qcommit/qrevert).

So for qbzr 0.14 I'm planning to disable overloading merge command with --qpreview to unblock pipeline plugin.

Changed in qbzr:
importance: Medium → High
milestone: none → 0.14
status: New → Triaged
Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

Thank-you. That's sound like a good plan going forward.

Revision history for this message
Alexander Belchenko (bialix) wrote :

I've filed several bugs for discussed features:

* https://bugs.launchpad.net/bzr/+bug/415231
* https://bugs.launchpad.net/qbzr/+bug/415230
* https://bugs.launchpad.net/qbzr/+bug/415232

Now merge --qpreview disabled in qbzr trunk (at least for 0.14 release).

Changed in qbzr:
assignee: nobody → Alexander Belchenko (bialix)
status: Triaged → Fix Released
Aaron Bentley (abentley)
Changed in bzr-pipeline:
status: Triaged → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

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