merge-upstream in an empty branch doesn't specify --create
Bug #385667 reported by
James Westby
This bug affects 2 people
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
bzr-builddeb |
Fix Released
|
Medium
|
Jelmer Vernooij |
Bug Description
Doing merge-upstream in an empty branch does three odd things.
Firstly it tries to add a changelog entry at the end, but it doesn't use --create.
Secondly, you get negative revision numbers for the upstream revisions.
Thirdly, it removes any .bzrignore.
Perhaps the first two are both ok, or perhaps merge-upstream shouldn't be allowed
in this case, with something else being done instead.
Thanks,
James
Related branches
lp:~al-maisan/bzr-builddeb/odd-behaviour-385667
Rejected
for merging
into
lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old
- James Westby: Needs Resubmitting
- Diff: None lines
lp:~jelmer/bzr-builddeb/fix-merge-upstream-in-empty
- James Westby: Approve
- Jelmer Vernooij: Pending requested
-
Diff: 139 lines (+37/-15)5 files modifiedcmds.py (+10/-6)
debian/changelog (+4/-1)
import_dsc.py (+5/-4)
merge_upstream.py (+10/-4)
tests/blackbox/test_merge_upstream.py (+8/-0)
Superseded
for merging
into
lp:~jelmer/bzr-builddeb/521341-builddeb-strict
- Jelmer Vernooij: Pending requested
-
Diff: 3368 lines (+1369/-932)30 files modified__init__.py (+43/-30)
bzr-builddeb_0.1-1_i386.changes (+0/-21)
changes.py (+0/-84)
cmds.py (+96/-81)
config.py (+6/-6)
debian/NEWS (+6/-0)
debian/changelog (+128/-2)
debian/control (+3/-4)
debian/rules (+12/-3)
doc/user_manual/configuration.rst (+3/-3)
doc/user_manual/hooks.rst (+5/-0)
errors.py (+1/-8)
import_dsc.py (+41/-170)
info.py (+1/-1)
launchpad.py (+55/-11)
merge_package.py (+1/-1)
merge_upstream.py (+11/-148)
setup.py (+2/-1)
tests/__init__.py (+0/-1)
tests/blackbox/test_builddeb.py (+2/-1)
tests/blackbox/test_do.py (+5/-2)
tests/blackbox/test_merge_upstream.py (+43/-1)
tests/test_import_dsc.py (+17/-37)
tests/test_merge_upstream.py (+4/-113)
tests/test_repack_tarball.py (+3/-1)
tests/test_upstream.py (+345/-7)
tests/test_util.py (+24/-56)
upstream/__init__.py (+130/-71)
upstream/branch.py (+300/-0)
util.py (+82/-68)
description: | updated |
Changed in bzr-builddeb: | |
status: | In Progress → Confirmed |
Changed in bzr-builddeb: | |
assignee: | Muharem Hrnjadovic (al-maisan) → nobody |
Changed in bzr-builddeb: | |
status: | Confirmed → In Progress |
assignee: | nobody → Jelmer Vernooij (jelmer) |
importance: | Undecided → Medium |
summary: |
- merge-upstream in an empty branch is odd + merge-upstream in an empty branch doesn't specify --create |
Changed in bzr-builddeb: | |
status: | In Progress → Fix Committed |
milestone: | none → 2.8 |
Changed in bzr-builddeb: | |
milestone: | 2.8 → none |
milestone: | none → 2.7.4 |
status: | Fix Committed → Triaged |
status: | Triaged → Fix Released |
To post a comment you must log in.
An additional glitch needs fixing. The following error occurs when calling "bzr merge-upstream" in an empty branch.
{{{ python2. 6/dist- packages/ bzrlib/ commands. py", line 835, in exception_ to_return_ code python2. 6/dist- packages/ bzrlib/ commands. py", line 1030, in run_bzr python2. 6/dist- packages/ bzrlib/ commands. py", line 647, in run_argv_aliases **all_cmd_ args) mhr/.bazaar/ plugins/ builddeb/ cmds.py" , line 617, in run type=merge_ type) mhr/.bazaar/ plugins/ builddeb/ import_ dsc.py" , line 1617, in merge_upstream upstream_ revision = get_snapshot_ revision( previous_ version. upstream_ version)
Traceback (most recent call last):
File "/usr/lib/
return the_callable(*args, **kwargs)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/home/
merge_
File "/home/
previous_
AttributeError: 'NoneType' object has no attribute 'upstream_version'
}}}