up-thread interacts poorly with remerge

Bug #202222 reported by Aaron Bentley on 2008-03-14
Affects Status Importance Assigned to Milestone

Bug Description

If up-thread causes a merge to be performed and then remerge is invoked, the lower thread's version will be used. up-thread seems to also swap the THIS and OTHER trees vs merge or remerge.

Robert Collins (lifeless) wrote :

I'm not sure what 'the lower threads version' means here; anyhow - there is an open TODO to set better names for the <<<< >>>> markers.

Changed in bzr-loom:
importance: Undecided → Medium
status: New → Triaged
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers