Launchpad itself

Merge lp:~allenap/launchpad/rocketfuel-get-overwrite into lp:launchpad

  1. rocketfuel-get-overwrite
  2. Merge into devel
Proposed by Gavin Panella
Status: Merged
Merged at revision: not available
Proposed branch: lp:~allenap/launchpad/rocketfuel-get-overwrite
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~allenap/launchpad/rocketfuel-get-overwrite
Reviewer Review Type Date Requested Status
Michael Nelson (community) code Approve
Review via email: mp+12038@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Just forces overwrite=True when pulling sourcecode branches. This comes as a result of the "dulwich" issue as discussed on launchpad-dev.

Revision history for this message
Michael Nelson (michael.nelson) wrote :

<noodles775> allenap: so your branch will result in *all* branches updated including the overwrite flag right? Are there any side-effects or dangers in doing this?
<allenap> noodles775: If someone has edited one of their sourcecode branches it will be clobbered.
<allenap> noodles775: But people - including me - shouldn't really be making a habit of that, because if I forget to revert I might get strange behaviour in other branches.
<noodles775> allenap: ah, so update_branches() is only ever called in update_sourcecode() - right.
<noodles775> Yep.
<allenap> noodles775: Yep, I think so.
<noodles775> Yep, it is (currently).

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/devscripts/sourcecode.py'
2--- lib/devscripts/sourcecode.py 2009-09-11 05:01:06 +0000
3+++ lib/devscripts/sourcecode.py 2009-09-18 08:33:35 +0000
4@@ -134,7 +134,7 @@
5 remote_branch.bzrdir.root_transport)
6 try:
7 local_tree.pull(
8- remote_branch,
9+ remote_branch, overwrite=True,
10 possible_transports=possible_transports)
11 except BzrError:
12 if optional: