No final name for trans_id 'new-1' while trying to merge,,, Help
Frits Jalvingh
jal at etc.to
Tue May 12 16:02:46 BST 2009
On Saturday 09 May 2009 21:52:35 Marius Kruger wrote:
> I'd suggest that you immediately make a backup of the current branch
> and repository if applicable,
> that way if you mess it up further its easy to get back here.
> (I normally zip it up)
That's not really a problem: both branches exist on their own (they are master
branches), and I can easily reproduce the problem by merging again - it
occurs always.
> The error message does not tell me much :(
> would you be able to send in the relevant section of your ~/.bzr.log
> hopefully that would shed more light.
Sure, here goes:
Tue 2009-05-12 16:57:47 +0200
0.012 bzr arguments: [u'log', u'-r', u'-2..']
0.020 looking for plugins in /home/jal/.bazaar/plugins
0.052 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.073 encoding stdout as sys.stdout encoding 'UTF-8'
0.090 return code 0
Tue 2009-05-12 16:58:10 +0200
0.011 bzr arguments: [u'merge', u'bzr://bzr/sharedlibs-trunk']
0.020 looking for plugins in /home/jal/.bazaar/plugins
0.052 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.134 opening working tree '/home/jal/test/domui-merge'
1.579 Using fetch logic to copy between RemoteRepository(bzr://bzr/.bzr/)
(<RemoteRepositoryFormat>) and
KnitPackRepository('file:///home/jal/test/.bzr/repository/')
(<RepositoryFormatKnitPack6RichRoot>)
1.579 fetch up to rev {jal at etc.to-20090511173429-ax0edr8hydqua8zc}
12.057 Base revid: 'jal at etc.to-20090401140849-ide724w7hyu7lglb'
[24548] 2009-05-12 16:58:22.722 INFO: +N
to.etc.server/src/to/etc/server/servicer/IServiceAuthenticator.java
[24548] 2009-05-12 16:58:22.724 INFO: M
to.etc.alg/src/to/etc/util/ClassUtil.java
[24548] 2009-05-12 16:58:22.724 INFO: M
to.etc.alg/src/to/etc/util/DeveloperOptions.java
[24548] 2009-05-12 16:58:22.724 INFO: M
to.etc.alg/src/to/etc/util/StringTool.java
[24548] 2009-05-12 16:58:22.724 INFO: M
to.etc.alg/src/to/etc/util/WrappedException.java
[24548] 2009-05-12 16:58:22.724 INFO: M
to.etc.db/src/to/etc/dbpool/PreparedStatementProxy.java
[24548] 2009-05-12 16:58:22.724 INFO: M
to.etc.db/src/to/etc/dbpool/StatementProxy.java
[24548] 2009-05-12 16:58:22.725 INFO: M
to.etc.server/src/to/etc/server/injector/RequestRetrieverProvider.java
[24548] 2009-05-12 16:58:22.725 INFO: M
to.etc.server/src/to/etc/server/servicer/AjaxServlet.java
[24548] 2009-05-12 16:58:22.725 INFO: M
to.etc.server/src/to/etc/server/servicer/ServiceCaller.java
[24548] 2009-05-12 16:58:22.725 INFO: M
to.etc.server/src/to/etc/server/servicer/ServiceCallerCallback.java
[24548] 2009-05-12 16:58:22.725 INFO: M
to.etc.server/src/to/etc/server/servicer/ServiceServerContext.java
12.418 Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 727, in
exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 922, in
run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 559, in
run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/qbzr/lib/commands.py",
line 632, in run
return bzrlib.builtins.cmd_merge.run(self, *args, **kw)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3550, in
run
verified)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3568, in
_do_merge
conflict_count = merger.do_merge()
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 493, in
do_merge
self._do_merge_to(merge)
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 465, in
_do_merge_to
merge.do_merge()
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 606, in
do_merge
results = self.tt.apply(no_conflicts=True)
File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 1348, in
apply
inventory_delta = self._generate_inventory_delta()
File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 1378, in
_generate_inventory_delta
new_paths = self._inventory_altered()
File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 519, in
_inventory_altered
return sorted(FinalPaths(self).get_paths(new_ids))
File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 1990, in
get_paths
return [(self.get_path(t), t) for t in trans_ids]
File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 1986, in
get_path
self._known_paths[trans_id] = self._determine_path(trans_id)
File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 1981, in
_determine_path
return pathjoin(self.get_path(parent_id), name)
File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 1986, in
get_path
self._known_paths[trans_id] = self._determine_path(trans_id)
File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 1976, in
_determine_path
name = self.transform.final_name(trans_id)
File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 606, in
final_name
raise NoFinalPath(trans_id, self)
NoFinalPath: No final name for trans_id 'new-1'
file-id: None
root trans-id: 'new-0'
12.418 return code 3
Thanks for your time,
Frits
More information about the bazaar
mailing list