QBzr

Merge lp:~doxxx/qbzr/qconflicts-cmdline-splitting into lp:qbzr

  1. qconflicts-cmdline-splitting
  2. Merge into trunk2a
Proposed by Gordon Tyler
Status: Rejected
Rejected by: Alexander Belchenko
Proposed branch: lp:~doxxx/qbzr/qconflicts-cmdline-splitting
Merge into: lp:qbzr
Diff against target: 24 lines (+2/-2)
2 files modified
README.txt (+1/-1)
__init__.py (+1/-1)
To merge this branch: bzr merge lp:~doxxx/qbzr/qconflicts-cmdline-splitting
Reviewer Review Type Date Requested Status
Gordon Tyler Disapprove
QBzr Developers Pending
Review via email: mp+28560@code.launchpad.net

Description of the change

Updated README and version check in __init__.py since qbzr requires bzrlib.cmdline from bzr 2.2 now.

To post a comment you must log in.
Revision history for this message
Gordon Tyler (doxxx) wrote :

Not necessary anymore with Gary's workaround for bzr 2.1.

review: Disapprove

Unmerged revisions

1286. By Gordon Tyler

Updated bzr version check to require 2.2 since qbzr now uses the bzrlib.cmdline module.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.txt'
2--- README.txt 2009-10-27 17:49:10 +0000
3+++ README.txt 2010-06-26 13:46:25 +0000
4@@ -12,7 +12,7 @@
5
6 * Python 2.4, 2.5 or 2.6
7
8- * Bazaar VCS itself
9+ * Bazaar 2.2
10
11 * PyQt 4.4 with Qt 4.4 or later
12 http://www.riverbankcomputing.co.uk/pyqt/
13
14=== modified file '__init__.py'
15--- __init__.py 2010-05-14 08:07:30 +0000
16+++ __init__.py 2010-06-26 13:46:25 +0000
17@@ -95,7 +95,7 @@
18 raise IncompatibleAPI(object_with_api, wanted_mimimum_api,
19 minimum, current)
20
21-require_mimimum_api(bzrlib, (2, 1, 0))
22+require_mimimum_api(bzrlib, (2, 2, 0))
23
24 from bzrlib.commands import plugin_cmds
25

Subscribers

People subscribed via source and target branches