Merge lp:~abentley/charms/precise/juju-reports/local-pull into lp:~juju-qa/charms/precise/juju-reports/trunk
Proposed by
Aaron Bentley
Status: | Merged |
---|---|
Merged at revision: | 37 |
Proposed branch: | lp:~abentley/charms/precise/juju-reports/local-pull |
Merge into: | lp:~juju-qa/charms/precise/juju-reports/trunk |
Diff against target: |
23 lines (+5/-4) 1 file modified
hooks/common.py (+5/-4) |
To merge this branch: | bzr merge lp:~abentley/charms/precise/juju-reports/local-pull |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Curtis Hovey (community) | code | Approve | |
Review via email: mp+226466@code.launchpad.net |
Commit message
Avoid overwriting source by pulling with --local.
Description of the change
I introduced branch binding to make committing easier when developing in a local deploy. Unfortunately, this also affects pull. It means that the pull performed by the charm can overwrite the contents of the current bound branch with the contents of the target branch.
This change ensures that pulls are local, so they do not overwrite the bound-to branch. In order to use --local, the branch must be bound, so "bzr bind" is issued before "bzr pull". Even though the branch is bound to the pulled-from branch, --local is used so that setting the revno does not remove revisions from the pulled-from branch.
To post a comment you must log in.
Thank you.