Code review comment for lp:~aaron-whitehouse/duplicity/bug_1620085_exclude-if-present-locked-folder
Revision history for this message
| Aaron Whitehouse (aaron-whitehouse) wrote | # |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
35a32c5
(Get the code!)
Hi Kenneth,
Apologies for any confusion. This branch is based of the current 0.7-series branch, not lp:duplicity.
I deliberately proposed this for merging into the 0.7-series (off which it was based):
https:/
It looks like you then proposed this merge into the 0.8-series which has caused the conflicts?
My intention was that once it was merged into 0.7 we could then easily merge all changes in 0.7 up into 0.8 and wrap up both this and any other improvements/fixes in the 0.7 series. Or, if you don't like that plan, I can easily make the same fixes on a branch from the 0.8 series.