Merge lp:~brian-murray/jockey/brian into lp:ubuntu/karmic/jockey
Proposed by
Brian Murray
Status: | Rejected |
---|---|
Rejected by: | Brian Murray |
Proposed branch: | lp:~brian-murray/jockey/brian |
Merge into: | lp:ubuntu/karmic/jockey |
Diff against target: |
30 lines 2 files modified
debian/changelog (+7/-0) debian/control (+3/-2) |
To merge this branch: | bzr merge lp:~brian-murray/jockey/brian |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | Needs Information | ||
Review via email: mp+13752@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 70. By Brian Murray
-
Depend on nvidia-common as NvidiaDetector is imported unconditionally
(LP: #438791)
$ bzr merge lp:~brian-murray/jockey/brian
bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.
I pick the change manually. Seems you didn't base on Vcs-Bzr, but perhaps on the auto-imports?