Merge lp://qastaging/~piastucki/bzr-xmloutput/xmlconflicts into lp://qastaging/bzr-xmloutput
Proposed by
Piotr Piastucki
| Status: | Merged |
|---|---|
| Approved by: | Guillermo Gonzalez |
| Approved revision: | 168 |
| Merged at revision: | 170 |
| Proposed branch: | lp://qastaging/~piastucki/bzr-xmloutput/xmlconflicts |
| Merge into: | lp://qastaging/bzr-xmloutput |
| Diff against target: |
424 lines (+374/-3) 7 files modified
__init__.py (+3/-1) cmds.py (+44/-0) conflictsxml.py (+41/-0) info.py (+2/-2) shelvexml.py (+44/-0) tests/test_conflicts_xml.py (+139/-0) tests/test_shelve_xml.py (+101/-0) |
| To merge this branch: | bzr merge lp://qastaging/~piastucki/bzr-xmloutput/xmlconflicts |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Guillermo Gonzalez | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch adds support for xmlconflicts command.
The branch is based on lp:~piastucki/bzr-xmloutput/xml-shelve-list and hence can be merge if lp:~piastucki/bzr-xmloutput/xml-shelve-list gets merged unmodifed.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1