cherrypicking merge fails: No final name for trans_id 'new-1'
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
Vincent Ladeuil |
Bug Description
I'm trying to cherrypick a change from a different, related branch into another one:
jal@pyramides:
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'
I use bzr from Jaunty, version=1.13.1-1:
jal@pyramides:
Bazaar (bzr) 1.13.1
Python interpreter: /usr/bin/python 2.6.2
Python standard library: /usr/lib/python2.6
bzrlib: /usr/lib/
Bazaar configuration: /home/jal/.bazaar
Bazaar log file: /home/jal/.bzr.log
Changed in bzr: | |
assignee: | Aaron Bentley (abentley) → nobody |
Changed in bzr: | |
status: | Triaged → Confirmed |
tags: | added: merge |
Changed in bzr: | |
milestone: | none → 2.0.6 |
status: | In Progress → Fix Released |
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?