Merge lp://staging/~gz/juju-release-tools/non_patch_ext into lp://staging/juju-release-tools

Proposed by Martin Packman
Status: Merged
Merged at revision: 331
Proposed branch: lp://staging/~gz/juju-release-tools/non_patch_ext
Merge into: lp://staging/juju-release-tools
Diff against target: 66 lines (+20/-3)
2 files modified (+5/-1)
tests/ (+15/-2)
To merge this branch: bzr merge lp://staging/~gz/juju-release-tools/non_patch_ext
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email:

Description of the change

Allow and ignore files that aren't patches in patch directory

Juju is ready to remove the current godeps patch from master as the fix has landed upstream. As git doesn't version directories, this means we want to add a file in there that will keep the directory around but not be applied as a patch.

This branch limits patching to files that have either the 'diff' or 'patch' file extension.

To post a comment you must log in.
332. By Martin Packman

Fix typo noted by babbageclunk in review

Revision history for this message
Curtis Hovey (sinzui) wrote :

thank you.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches