No final name for trans_id 'new-1' while trying to merge,,, Help
Frits Jalvingh
jal at etc.to
Fri May 8 00:34:16 BST 2009
Hello List,
I got this error while trying to merge a branch. It contains quite an
important piece of code and should be mergable again later, so I really,
really would like a workaround for this problem...
Can anyone tell me what this error means? Is there a workaround I can use?
I got the error on a different repository once before and reported it as a bug
(https://bugs.launchpad.net/bzr/+bug/364305), but have not gotten any
response. Since the earlier bug was caused by a cherrypick I can imagine that
but the current failure is not a cherrypick...
The full message is as follows:
jal at pyramides:~/bzrws/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'
bzr version reports:
jal at pyramides:~/bzrws/vp-lite-trunk$ bzr version
Bazaar (bzr) 1.14.1
Python interpreter: /usr/bin/python 2.6.2
Python standard library: /usr/lib/python2.6
bzrlib: /usr/lib/python2.6/dist-packages/bzrlib
Bazaar configuration: /home/jal/.bazaar
Bazaar log file: /home/jal/.bzr.log
Any idea is welcome...
Thanks,
Frits Jalvingh
More information about the bazaar
mailing list