PQM

lp://staging/~oddbloke/pqm/merge-directives

Created by Dan Watkins on 2008-07-09 and last modified on 2008-08-24

Get this branch:: bzr branch lp://staging/~oddbloke/pqm/merge-directives

Branch merges

No branches dependent on this one.

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

No reviews requested

On hold for merging into lp://staging/pqm

Robert Collins: Needs Resubmitting on 2009-03-26

Related bugs

Bug #80783: Should support merge requests with merge directives

Wishlist

Triaged

Remove

Link a bug report

Related blueprints

Branch information

Owner:: Dan Watkins

Project:: PQM

Status:: Development

Location:: http://bzr.daniel-watkins.co.uk/pqm/merge-directives

Last mirrored:: 2012-02-23

Next mirror:: Disabled

Updating branch...

Launchpad is processing new changes to this branch which will be available in a few minutes. Reload to see the changes.

Recent revisions

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.

»

Branch metadata

Branch format:: Branch format 6

Repository format:: Bazaar pack repository format 1 (needs bzr 0.92)

This branch contains Public information

Everyone can see this information.

Subscribers