tree transform cannot change root id
Bug #494269 reported by
James Westby
This bug affects 6 people
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
John A Meinel | ||
2.0 |
Fix Released
|
High
|
John A Meinel |
Bug Description
Hi,
bzr merge-package of lp:debian/smarty in to lp:ubuntu/smarty gives:
deleted misc
...
Path conflict: misc / misc
"bzr st":
removed:
misc/
...
conflicts:
Path conflict: misc / misc
ls misc*:
No matches: misc*
what's the conflict here? Why did it happen? What should I do to resolve
it, except just doing "bzr resolve misc", as that's all I can see to do?
Thanks,
James
Related branches
lp:~jameinel/bzr/2.0.4-change-root-id-494269
Merged
into
lp:bzr/2.0
- Robert Collins (community): Approve
-
Diff: 277 lines (+132/-19)4 files modifiedNEWS (+7/-0)
bzrlib/tests/test_revert.py (+12/-1)
bzrlib/tests/test_transform.py (+34/-6)
bzrlib/transform.py (+79/-12)
tags: | added: udd |
summary: |
- conflict on deleted directory? + tree transform cannot change root id |
To post a comment you must log in.
> What should I do to resolve it, except just doing "bzr resolve misc", as that's all I can see to do?
Did that work?
It may be that the problem is there are ignored files inside misc, in which case this is probably a dupe.