lp:~oddbloke/pqm/merge-directives

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~thumper/pqm/integration at revision 187

No reviews requested

On hold for merging into lp:pqm

Robert Collins: Needs Resubmitting on 2009-03-26

Diff: 793 lines (+488/-20) (has conflicts)

7 files modified

.bzrignore (+1/-0)
pqm/__init__.py (+79/-0)
pqm/script.py (+164/-8)
pqm/tests/test_pqm.py (+201/-4)
tests/Makefile.am (+2/-1)
tests/bzr-merge-2.sh (+20/-0)
tests/test-framework (+21/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #80783: Should support merge requests with merge directives

Wishlist

Triaged

Link a bug report

Related blueprints

181. By Dan Watkins on 2008-08-23

Readded replay merge as ReplayMergeCommand.

180. By Dan Watkins on 2008-08-23

Removed use of merge_callback.

179. By Dan Watkins on 2008-08-23

Refactored merge code from Command to MergeCommand.

178. By Dan Watkins on 2008-08-23

Removed replay legacy command.

177. By Dan Watkins on 2008-08-23

ExtendedMergeCommands now work with the UI correctly.

176. By Dan Watkins on 2008-08-23

Merged pqm.dev r183.

175. By Dan Watkins on 2008-07-17

Fixed failing tests.

174. By Dan Watkins on 2008-07-17

Merged pqm.dev r182, without fixing tests.

173. By Dan Watkins on 2008-07-09

Fixed issues with PGP headers and footers in merge directive mail.

172. By Dan Watkins on 2008-07-09

Modified test to step around issues with detecting which VCS a branch uses.