Well, it looks like bzr hates me today. I again got this error, this time with a normal merge:
jal@pyramides:~/work/vp-lite-trunk$ bzr merge ~/bzrws/vp-lite-split/shared
+N to.etc.server/src/to/etc/server/servicer/IServiceAuthenticator.java
M to.etc.alg/src/to/etc/util/ClassUtil.java
M to.etc.alg/src/to/etc/util/StringTool.java
M to.etc.alg/src/to/etc/util/WrappedException.java
M to.etc.db/src/to/etc/dbpool/PreparedStatementProxy.java
M to.etc.db/src/to/etc/dbpool/StatementProxy.java
M to.etc.server/src/to/etc/server/injector/RequestRetrieverProvider.java
M to.etc.server/src/to/etc/server/servicer/AjaxServlet.java
M to.etc.server/src/to/etc/server/servicer/ServiceCaller.java
M to.etc.server/src/to/etc/server/servicer/ServiceCallerCallback.java
M to.etc.server/src/to/etc/server/servicer/ServiceServerContext.java
/usr/lib/python2.6/dist-packages/bzrlib/ui/__init__.py:91: UserWarning: ProgressTask(0/2, msg='Apply phase') is not the active task ProgressTask(None/None, msg='')
% (task, self._task_stack[-1]))
/usr/lib/python2.6/dist-packages/bzrlib/ui/__init__.py:91: 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'
This is rather bad as this is quite an important thing to get merged. Any idea why this occurs?
Well, it looks like bzr hates me today. I again got this error, this time with a normal merge:
jal@pyramides: ~/work/ vp-lite- trunk$ bzr merge ~/bzrws/ vp-lite- split/shared server/ src/to/ etc/server/ servicer/ IServiceAuthent icator. java alg/src/ to/etc/ util/ClassUtil. java alg/src/ to/etc/ util/StringTool .java alg/src/ to/etc/ util/WrappedExc eption. java db/src/ to/etc/ dbpool/ PreparedStateme ntProxy. java db/src/ to/etc/ dbpool/ StatementProxy. java server/ src/to/ etc/server/ injector/ RequestRetrieve rProvider. java server/ src/to/ etc/server/ servicer/ AjaxServlet. java server/ src/to/ etc/server/ servicer/ ServiceCaller. java server/ src/to/ etc/server/ servicer/ ServiceCallerCa llback. java server/ src/to/ etc/server/ servicer/ ServiceServerCo ntext.java python2. 6/dist- packages/ bzrlib/ ui/__init_ _.py:91: UserWarning: ProgressTask(0/2, msg='Apply phase') is not the active task ProgressTask( None/None, msg='') stack[- 1])) python2. 6/dist- packages/ bzrlib/ ui/__init_ _.py:91: UserWarning: ProgressTask(2/3, msg='Merge phase') is not the active task ProgressTask( None/None, msg='') stack[- 1]))
+N to.etc.
M to.etc.
M to.etc.
M to.etc.
M to.etc.
M to.etc.
M to.etc.
M to.etc.
M to.etc.
M to.etc.
M to.etc.
/usr/lib/
% (task, self._task_
/usr/lib/
% (task, self._task_
bzr: ERROR: No final name for trans_id 'new-1'
file-id: None
root trans-id: 'new-0'
This is rather bad as this is quite an important thing to get merged. Any idea why this occurs?