pulling a loom resets to last-recorded state

Bug #201409 reported by Aaron Bentley
2
Affects Status Importance Assigned to Milestone
Loom
Triaged
High
Unassigned

Bug Description

I needed to split a thread-- it turned out that some of the work I had done should not have been combined with other work.

I wanted to split the thread at a particular revision, and

So I did this:
$ bzr create-thread subscription-updates
$ bzr pull -r thread:ORM-updates .
(and then I was going to uncommit the revision from ORM-updates that didn't belong in subscription-updates)

This caused the loom to be reset to its last-recorded state (I think). This is obviously not what I wanted. It's not even clear how to *get* what I wanted, since the problem is pulling ., not the revision spec.

Revision history for this message
John A Meinel (jameinel) wrote :

Something does seem a little fishy here.

It seems like maybe doing a "bzr record" first would make sure that the loom state is set on disk and then the pull wouldn't overwrite it.

Regardless, it would seem that "bzr pull" shouldn't smash the target loom record. Just like we do now with file contents, 'pull' preserves local modifications.

Revision history for this message
Robert Collins (lifeless) wrote : Re: [Bug 201409] Re: pulling a loom resets to last-recorded state

On Wed, 2008-03-12 at 15:06 +0000, John A Meinel wrote:
> Something does seem a little fishy here.
>
> It seems like maybe doing a "bzr record" first would make sure that the
> loom state is set on disk and then the pull wouldn't overwrite it.
>
> Regardless, it would seem that "bzr pull" shouldn't smash the target
> loom record. Just like we do now with file contents, 'pull' preserves
> local modifications.

Definitely a bug; it should set the basis loom to the pulled one, and
the current loom be 3-way merged with the changes from basis to new
basis. Basically the same as for working trees, and I would expect this
to come when 'merge' really merges the looms.

-Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.

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

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.