Revision 06edfd12
| b/devflow/flow.py | ||
|---|---|---|
| 302 | 302 |
upstream_branch = self.get_branch("release", version)
|
| 303 | 303 |
debian_branch = self.get_debian_branch("release", version)
|
| 304 | 304 |
tag = upstream_branch |
| 305 |
debial_tag = "debian/" + tag
|
|
| 305 |
debian_tag = "debian/" + tag
|
|
| 306 | 306 |
|
| 307 | 307 |
edit_action = partial(self.edit_changelog, upstream_branch, "develop") |
| 308 | 308 |
self.check_edit_changelog(edit_action, args, default=True) |
| ... | ... | |
| 321 | 321 |
repo.git.checkout(master) |
| 322 | 322 |
repo.git.tag("%s" % tag)
|
| 323 | 323 |
repo.git.checkout(debian) |
| 324 |
repo.git.tag("%s" % debian)
|
|
| 324 |
repo.git.tag("%s" % debian_tag)
|
|
| 325 | 325 |
|
| 326 | 326 |
#merge release changes to upstream |
| 327 | 327 |
self.merge_branches(upstream, upstream_branch, args, default=True) |
Also available in: Unified diff