Unexpected conflict switching within colo branch

Bug #933362 reported by Jonathan Lange on 2012-02-16
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
High
Unassigned
Breezy
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:~/src/testtools$ cd /tmp
jml@valour:/tmp$ bzr branch lp:testtools
Branched 245 revisions.
jml@valour:/tmp$ cd testtools/
jml@valour:/tmp/testtools$ bzr switch -b trunk
Tree is up to date at revision 245.
Switched to branch: /tmp/testtools/
jml@valour:/tmp/testtools$ bzr switch -b testtools-0.9.12 -r tag:testtools-0.9.12
Updated to revision 245.
Switched to branch: /tmp/testtools/
jml@valour:/tmp/testtools$ bzr switch -b testtools-0.9.13 -r tag:testtools-0.9.13
Text conflict in NEWS
Text conflict in testtools/__init__.py
Text conflict in testtools/tests/test_deferredruntest.py
Text conflict in testtools/tests/test_fixturesupport.py
Text conflict in testtools/tests/test_testresult.py
Updated to revision 245.
Switched to branch: /tmp/testtools/
jml@valour:/tmp/testtools$

Related branches

Vincent Ladeuil (vila) wrote :

> 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.

Changed in bzr:
status: New → Confirmed
importance: Undecided → High
Jonathan Lange (jml) on 2012-02-20
tags: added: colocated
removed: colo
Jelmer Vernooij (jelmer) on 2017-11-08
tags: added: check-for-breezy
Jelmer Vernooij (jelmer) on 2018-04-03
tags: removed: check-for-breezy
Changed in brz:
status: New → Triaged
importance: Undecided → High
milestone: none → 3.0.0
Jelmer Vernooij (jelmer) on 2018-11-11
Changed in brz:
assignee: nobody → Jelmer Vernooij (jelmer)
status: Triaged → In Progress
Jelmer Vernooij (jelmer) on 2018-11-11
Changed in brz:
status: In Progress → Fix Committed
Jelmer Vernooij (jelmer) on 2018-11-16
Changed in brz:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers