← Back to branch summary

~oddbloke/pqm/merge-directives

From Revision 181 to 162

expand all expand all

Rev   Summary Authors Date Diff Files
181
Readded replay merge as ReplayMergeCommand.
Daniel Watkins 15 years ago Diff Files
180
Removed use of merge_callback.
Daniel Watkins 15 years ago Diff Files
179
Refactored merge code from Command to MergeCommand.
Daniel Watkins 15 years ago Diff Files
178
Removed replay legacy command.
Daniel Watkins 15 years ago Diff Files
177
ExtendedMergeCommands now work with the UI correctly.
Daniel Watkins 15 years ago Diff Files
176
Merged pqm.dev r183.
Daniel Watkins 15 years ago Diff Files
175
Fixed failing tests.
Daniel Watkins 15 years ago Diff Files
174
Merged pqm.dev r182, without fixing tests.
Daniel Watkins 15 years ago Diff Files
173
Fixed issues with PGP headers and footers in merge directive...
Daniel Watkins 15 years ago Diff Files
172
Modified test to step around issues with detecting which VCS...
Daniel Watkins 15 years ago Diff Files
171
Fixed misleading test output.
Daniel Watkins 15 years ago Diff Files
170
Fixed indentation issues.
Daniel Watkins 15 years ago Diff Files
169
Fixed failing tests.
Daniel Watkins 15 years ago Diff Files
168
Tweaked bits and pieces to get it working.
Daniel Watkins 15 years ago Diff Files
167
Moved Bazaar2Handler._do_star_merge to Bazaar2Handler._do_bz...
Daniel Watkins 15 years ago Diff Files
166
Merged test fixes.
Daniel Watkins 15 years ago Diff Files
165
Merged pqm.dev r174.
Daniel Watkins 15 years ago Diff Files
164
Commit work-in-progress
Aaron Bentley 15 years ago Diff Files
163
Refactor do_merge for ExtendedMergeCommand
Aaron Bentley 17 years ago Diff Files
162
Add branch and revision merging
Aaron Bentley 17 years ago Diff Files