Comment 16 for bug 364305

Revision history for this message
Kristian Nielsen (knielsen) wrote :

I verified that this still occurs with bzr 2.0.3:

$ bzr --version
Bazaar (bzr) 2.0.3
  Python interpreter: /usr/bin/python 2.5.2
  Python standard library: /usr/lib/python2.5
  Platform: Linux-2.6.27.9-kn-x86_64-with-debian-lenny-sid
  bzrlib: /usr/lib/python2.5/site-packages/bzrlib
  Bazaar configuration: /home/knielsen/.bazaar
  Bazaar log file: /home/knielsen/.bzr.log

Copyright 2005, 2006, 2007, 2008, 2009 Canonical Ltd.
http://bazaar-vcs.org/

bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.

$ bzr branch 'lp:~knielsen/maria/mariadb-5.1-pbxt-merge-take2'
Branched 2696 revision(s).
$ bzr branch '-rrevid:<email address hidden>' lp:pbxt merge-source
Branched 609 revision(s).
$ cd mariadb-5.1-pbxt-merge-take2/
$ bzr co
$ bzr merge ../merge-source
+N mysql-test/suite/pbxt/r/type_varchar.result.OTHER
+N mysql-test/suite/pbxt/t/type_varchar.test.OTHER
 M storage/pbxt/src/ha_pbxt.cc
Contents conflict in mysql-test/suite/pbxt/r/type_varchar.result
Contents conflict in mysql-test/suite/pbxt/t/type_varchar.test
/usr/lib/python2.5/site-packages/bzrlib/ui/__init__.py:148: UserWarning: ProgressTask(0/2, msg='Apply phase') is not the active task ProgressTask(None/None, msg='')
  % (task, self._task_stack[-1]))
/usr/lib/python2.5/site-packages/bzrlib/ui/__init__.py:148: UserWarning: ProgressTask(2/3, msg='Merge phase') is not the active task ProgressTask(None/None, msg='')
  % (task, self._task_stack[-1]))
bzr: ERROR: No final name for trans_id 'new-1'
file-id: None
root trans-id: 'new-0'