Unexpected conflict switching within colo branch
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
High
|
Unassigned | ||
Breezy |
Fix Released
|
High
|
Jelmer Vernooij |
Bug Description
I got a conflict switching from one release of my project to another. I don't expect it to be the case, since one is just a future version of the other.
Also, it's not clear what it would mean to resolve the conflict.
jml@valour:
jml@valour:/tmp$ bzr branch lp:testtools
Branched 245 revisions.
jml@valour:/tmp$ cd testtools/
jml@valour:
Tree is up to date at revision 245.
Switched to branch: /tmp/testtools/
jml@valour:
Updated to revision 245.
Switched to branch: /tmp/testtools/
jml@valour:
Text conflict in NEWS
Text conflict in testtools/
Text conflict in testtools/
Text conflict in testtools/
Text conflict in testtools/
Updated to revision 245.
Switched to branch: /tmp/testtools/
jml@valour:
Related branches
- Martin Packman: Approve
-
Diff: 61 lines (+32/-2)2 files modifiedbreezy/builtins.py (+5/-2)
breezy/tests/blackbox/test_switch.py (+27/-0)
tags: |
added: colocated removed: colo |
tags: | added: check-for-breezy |
tags: | removed: check-for-breezy |
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → High |
milestone: | none → 3.0.0 |
Changed in brz: | |
assignee: | nobody → Jelmer Vernooij (jelmer) |
status: | Triaged → In Progress |
Changed in brz: | |
status: | In Progress → Fix Committed |
Changed in brz: | |
status: | Fix Committed → Fix Released |
> jml@valour: /tmp/testtools$ bzr switch -b testtools-0.9.12 -r tag:testtools- 0.9.12
> Updated to revision 245.
At this point there are uncommitted changes in the tree. That's a bug.