bzr merge-upstream seems to ignore -r <rev>
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Ubuntu Distributed Development |
Fix Released
|
Critical
|
Unassigned | ||
bzr-builddeb |
Fix Released
|
Critical
|
Unassigned |
Bug Description
It doesn't seem to happen everytime on every branch, but here is a non working testcase:
clutk trunk rev 213 (from lp:clutk)
clutk-packaging rev 194 (from lp:~unity-team/clutk/packaging)
As you can see, the release is in rev 212. 213 is just post-release bump.
So, I want to release with rev 212 imported in my packaging branch as merge-upstream.
$ bzr merge-upstream -r -2 ../clutk-
$ debcommit
-> rev 213 from clutk trunk has been imported too
bzr merge-upstream -r 212 ../clutk-
bzr merge-upstream -r tag:0.3.32 ../clutk-
Same with those syntax.
So, right now, I bzr branch -r -2 clutk-trunk clutk-release
and do merge-upstream from clutk-release as a workaround.
Related branches
Changed in bzr-builddeb: | |
status: | New → Triaged |
importance: | Undecided → Critical |
Changed in udd: | |
status: | New → Triaged |
importance: | Undecided → Critical |
Changed in bzr-builddeb: | |
status: | Triaged → Fix Committed |
Changed in bzr-builddeb: | |
status: | Fix Committed → Fix Released |
Changed in udd: | |
status: | Triaged → Fix Released |