Some thoughts on loom

[Forest Bond]

Hi,

I've been using loom for a little bit now, and had some difficulty applying it
as a quilt replacement due to the over head of merging every time I switch
threads following a commit.  I felt like I was resolving more conflicts than I
should have been.  This suspicion was confirmed when I did the following:

Assume I have a loom that looks something like this:

  B
  A
->trunk

I have already committed any merges necessary to move between threads without
committing.

I do the following:

1. bzr -r thread:trunk -r thread:A
2. bzr revert --forget-merges
3. bzr commit (trunk and A now have the same code content, but their histories
   don't contain the same commits).
4. bzr up-thread (no problems)
5. bzr combine-thread

Loom now looks like this:

  B
->trunk

Now:

6. bzr up-thread

This causes a conflict.  `bzr diff' prints this:

--------------------------------------------------------------------------------
=== modified file 'tests.py'
--- tests.py    2008-04-11 21:42:31 +0000
+++ tests.py    2008-04-12 10:40:23 +0000
@@ -170,6 +170,8 @@
                 resumed = True
         assert self.task.finished

+<<<<<<< TREE
+=======
     def _testPausePrecludes(self, action):
         paused = False

@@ -188,6 +190,7 @@
     def testPausePrecludesFail(self):
         return self._testPausePrecludes('fail')

+>>>>>>> MERGE-SOURCE
 class SuccessfulSimpleTaskTestCase(TaskTestMixin, TestCase):
     def setUp(self):
         def fn(self):
--------------------------------------------------------------------------------

This conflict doesn't make sense to me.  It looks like a false positive.

Can anyone explain?

Thanks,
Forest
-- 
Forest Bond
http://www.alittletooquiet.net
http://www.pytagsfs.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080412/f4c5bfaa/attachment.pgp