Merge lp://qastaging/~jelmer/brz/enforce-formatting into lp://qastaging/brz/3.3
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Approved by: | Jelmer Vernooij |
| Approved revision: | 7814 |
| Merged at revision: | 7813 |
| Proposed branch: | lp://qastaging/~jelmer/brz/enforce-formatting |
| Merge into: | lp://qastaging/brz/3.3 |
| Diff against target: |
204 lines (+32/-19) 10 files modified
Makefile (+6/-1) breezy/git/interrepo.py (+5/-4) breezy/git/refs.py (+3/-1) breezy/git/tests/test_workingtree.py (+1/-1) breezy/git/transform.py (+1/-1) breezy/git/tree.py (+8/-5) breezy/plugins/launchpad/lp_directory.py (+1/-1) breezy/repository.py (+4/-2) breezy/version_info_formats/__init__.py (+1/-1) tarmac.conf (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~jelmer/brz/enforce-formatting |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jelmer Vernooij | Approve | ||
|
Review via email:
|
|||
Commit message
Enforce formatting at merge time
Description of the change
Enforce formatting at merge time
To post a comment you must log in.
Revision history for this message
| Jelmer Vernooij (jelmer) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
