merge-upstream doesn't work in shared treeless repo
Bug #486534 reported by
Robert Collins
This bug affects 2 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| bzr-builddeb |
Fix Released
|
High
|
Unassigned | ||
Bug Description
I have the following layout:
bzr init-repo --no-trees .
bzr branch lp:proj trunk
bzr branch lp:ubuntu/proj debian # not really, because the import has different history, but I have a connected branch with history
bzr checkout --lightweight debian working
cd working
bzr merge-upstream http://
bzr: ERROR: No WorkingTree exists for "file:/
Related branches
lp:~lifeless/bzr-builddeb/trunk
- Bzr-builddeb-hackers: Pending requested
-
Diff: 268 lines (+183/-27)4 files modifiedbzrtools_import.py (+32/-21)
debian/changelog (+7/-0)
dh_make.py (+10/-1)
tests/blackbox/test_merge_upstream.py (+134/-5)
- James Westby: Approve
-
Diff: 473 lines (+64/-53)7 files modifiedbuilder.py (+5/-5)
changes.py (+1/-1)
cmds.py (+19/-19)
directory.py (+5/-5)
hooks.py (+2/-2)
import_dsc.py (+16/-5)
upstream.py (+16/-16)
| Changed in bzr-builddeb: | |
| status: | New → Confirmed |
| importance: | Undecided → High |
Revision history for this message
| James Westby (james-w) wrote Re: [Bug 486534] [NEW] merge-upstream doesn't work in shared treeless repo | #1 |
| Changed in bzr-builddeb: | |
| status: | Confirmed → Fix Committed |
| Changed in bzr-builddeb: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
status fixcommitted