thread: operator blows up on normal branches in an ugly fashion.

[Forest Bond]

$ bzr merge -r thread:logistix-plugin-tool-return-non-zero-on-test-failure..thread:ui-testing
Merging from remembered location /home/forest.bond/work/software/logistix/logistix.dev/
Merging from remembered location /home/forest.bond/work/software/logistix/logistix.dev/
bzr: ERROR: exceptions.AttributeError: 'BzrBranch6' object has no attribute 'get_loom_state'

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 834, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 790, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 492, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2872, in run
    location, revision, remember, possible_transports, pb)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2964, in _get_merger_from_branch
    revision[-1].in_history(other_branch).rev_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/revisionspec.py", line 225, in in_history
    return self._match_on_and_check(branch, revs)
  File "/usr/lib/python2.5/site-packages/bzrlib/revisionspec.py", line 207, in _match_on_and_check
    info = self._match_on(branch, revs)
  File "/home/forest.bond/.bazaar/plugins/loom/revspec.py", line 47, in _match_on
    state = branch.get_loom_state()
AttributeError: 'BzrBranch6' object has no attribute 'get_loom_state'

bzr 1.3.1 on python 2.5.2.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'merge', '-r', 'thread:logistix-plugin-tool-return-non-zero-on-test-failure..thread:ui-testing']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
  builddeb /usr/lib/python2.5/site-packages/bzrlib/plugins/builddeb [0.92.0dev0]
  bzrtools /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.3.0]
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  loom /home/forest.bond/.bazaar/plugins/loom [1.3.0]
  rebase /usr/lib/python2.5/site-packages/bzrlib/plugins/rebase [0.3.0]
  svn /usr/lib/python2.5/site-packages/bzrlib/plugins/svn [0.4.9]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.
$ bzr show-loom
  temperature-monitoring-warning-with-mandatory-acknowledgement
  smart-warning-with-mandatory-acknowledgement
  warning-with-mandatory-acknowledgement
  exceptions-clean-up
  ui-testing
  logistix-plugin-tool-return-non-zero-on-test-failure
  setup.py-test
=>upload-logfile-plugs-fix-missing-import
  logistix.loom

[Robert Collins (lifeless)]

On Sat, 2008-05-17 at 04:25 +0000, Forest Bond wrote:
> Public bug reported:
>
> $ bzr merge -r thread:logistix-plugin-tool-return-non-zero-on-test-failure..thread:ui-testing
> Merging from remembered location /home/forest.bond/work/software/logistix/logistix.dev/
> Merging from remembered location /home/forest.bond/work/software/logistix/logistix.dev/
> bzr: ERROR: exceptions.AttributeError: 'BzrBranch6' object has no attribute 'get_loom_state'

Try adding . to the merge
bzr merge -r x..y .

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

[Forest Bond (forest-bond)]

Hi,

On Sat, May 17, 2008 at 06:54:59AM -0000, Robert Collins wrote:
> On Sat, 2008-05-17 at 04:25 +0000, Forest Bond wrote:
> > Public bug reported:
> >
> > $ bzr merge -r thread:logistix-plugin-tool-return-non-zero-on-test-failure..thread:ui-testing
> > Merging from remembered location /home/forest.bond/work/software/logistix/logistix.dev/
> > Merging from remembered location /home/forest.bond/work/software/logistix/logistix.dev/
> > bzr: ERROR: exceptions.AttributeError: 'BzrBranch6' object has no attribute 'get_loom_state'
>
> Try adding . to the merge
> bzr merge -r x..y .

Yep, works. What's the default merge destination if I don't specify one?

-Forest
--
Forest Bond
http://www.alittletooquiet.net
http://www.pytagsfs.org

[Robert Collins (lifeless)]

On Sat, 2008-05-17 at 12:59 +0000, Forest Bond wrote:
> Hi,
>
> On Sat, May 17, 2008 at 06:54:59AM -0000, Robert Collins wrote:
> > On Sat, 2008-05-17 at 04:25 +0000, Forest Bond wrote:
> > > Public bug reported:
> > >
> > > $ bzr merge -r thread:logistix-plugin-tool-return-non-zero-on-test-failure..thread:ui-testing
> > > Merging from remembered location /home/forest.bond/work/software/logistix/logistix.dev/
> > > Merging from remembered location /home/forest.bond/work/software/logistix/logistix.dev/
> > > bzr: ERROR: exceptions.AttributeError: 'BzrBranch6' object has no attribute 'get_loom_state'
> >
> > Try adding . to the merge
> > bzr merge -r x..y .
>
> Yep, works. What's the default merge destination if I don't specify
> one?

It tries to merge *from* the parent, which isn't a loom :).

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

[Forest Bond (forest-bond)]

On Sat, May 17, 2008 at 02:04:45PM -0000, Robert Collins wrote:
> On Sat, 2008-05-17 at 12:59 +0000, Forest Bond wrote:
> > Hi,
> >
> > On Sat, May 17, 2008 at 06:54:59AM -0000, Robert Collins wrote:
> > > On Sat, 2008-05-17 at 04:25 +0000, Forest Bond wrote:
> > > > Public bug reported:
> > > >
> > > > $ bzr merge -r thread:logistix-plugin-tool-return-non-zero-on-test-failure..thread:ui-testing
> > > > Merging from remembered location /home/forest.bond/work/software/logistix/logistix.dev/
> > > > Merging from remembered location /home/forest.bond/work/software/logistix/logistix.dev/
> > > > bzr: ERROR: exceptions.AttributeError: 'BzrBranch6' object has no attribute 'get_loom_state'
> > >
> > > Try adding . to the merge
> > > bzr merge -r x..y .
> >
> > Yep, works. What's the default merge destination if I don't specify
> > one?
>
> It tries to merge *from* the parent, which isn't a loom :).

Oh, right.

-Forest
--
Forest Bond
http://www.alittletooquiet.net
http://www.pytagsfs.org