Merge lp://staging/~oddbloke/pqm/remove-vcs-abstraction into lp://staging/pqm
Proposed by
Jelmer Vernooij
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~oddbloke/pqm/remove-vcs-abstraction |
| Merge into: | lp://staging/pqm |
| Diff against target: |
943 lines (+738/-6) (has conflicts) 2 files modified
pqm/__init__.py (+679/-0) pqm/tests/test_pqm.py (+59/-6) Text conflict in pqm/__init__.py Text conflict in pqm/tests/test_pqm.py |
| To merge this branch: | bzr merge lp://staging/~oddbloke/pqm/remove-vcs-abstraction |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| pqm developers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 201. By Dan Watkins
-
Merged in further test changes.
- 200. By Dan Watkins
-
Renamed Bazaar2Handler to BzrHandler.
- 199. By Dan Watkins
-
Removed VCSHandler.
- 198. By Dan Watkins
-
Moved Command.
wrap_command to MergeCommand. wrap_command. - 197. By Dan Watkins
-
Removed needless merge_method parameter to MergeCommand.
do_merge. - 196. By Dan Watkins
-
Moved Command.do_merge to MergeCommand.
do_merge. - 195. By Dan Watkins
-
Removed debug statement from test.
- 194. By Dan Watkins
-
Removed now-irrelevant config filenames.
- 193. By Dan Watkins
-
Removed Command.get_vcs.
- 192. By Dan Watkins
-
Removed Command.
get_branch_ handler and accompanying tests.
Updating diff...
An updated diff will be available in a few minutes. Reload to see the changes.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
