combine-thread should perform safety checks
Bug #506235 reported by
Robert Collins
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Loom |
Fix Released
|
Wishlist
|
Robert Collins | ||
Bug Description
when combine thread will be dropping a thread that has changes that have neither been cherrypicked into a lower thread nor are preserved in a higher thread, it should error unless --force is given.
Related branches
lp:bzr-loom
- Paul Hummer (community): Approve
-
Diff: 2313 lines (+1033/-321)18 files modified.testr.conf (+4/-0)
HOWTO (+19/-1)
NEWS (+102/-2)
README (+5/-3)
TODO (+1/-2)
__init__.py (+26/-7)
branch.py (+226/-126)
commands.py (+107/-40)
formats.py (+74/-0)
revspec.py (+67/-32)
setup.py (+3/-5)
tests/__init__.py (+4/-1)
tests/blackbox.py (+147/-19)
tests/test_branch.py (+84/-35)
tests/test_revspec.py (+49/-5)
tests/test_tree.py (+29/-13)
tree.py (+58/-30)
version.py (+28/-0)
| Changed in bzr-loom: | |
| status: | New → Triaged |
| importance: | Undecided → Wishlist |
| Changed in bzr-loom: | |
| assignee: | nobody → Robert Collins (lifeless) |
| milestone: | none → 2.2 |
| status: | Triaged → Fix Released |
To post a comment you must log in.
