<p dir="ltr">I don't have any easy answer here. It sounds like bzr is saying something is deleted that git thinks isn't there. I don't know if there is a rename confusing it or something else.<br>
Two thougts, you could try to hack the fast export data directly or you could hack the fast-export plugin to detect this change and just omit it.<br>
There are also tools like bzr fast-import-filter. I beleive that is designed more around importing just part of your project, but it might get you farther along.</p>
<p dir="ltr">John<br>
=:-></p>
<div class="gmail_quote">On Feb 25, 2014 11:53 PM, "Frits Jalvingh" <<a href="mailto:jal@etc.to">jal@etc.to</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr">Hello list,<div><div><div><br></div><div><div>I am trying to convert a largish bzr repository to git, using bzr fast-export and git fast-import. Exporting the file with bzr fast-export works, but importing fails with the error message:</div>
<div><br></div><div>git fast-import failed: fatal: Path viewpoint/WebContent/help/crm/Crm_jobtitlesEditPage.help.html not in branch</div><div><br></div><div>Looking in the export file I see the following two segments:</div>
<div><br></div><div>----- fragment one ------</div><div>commit refs/heads/4.2</div><div>mark :20503</div><div>committer <<a href="mailto:leo.van.der.ende@itris.nl" target="_blank">leo.van.der.ende@itris.nl</a>> 1352820423 +0100</div>
<div>data 14</div><div>user story A05</div><div>from :20502</div><div>R viewpoint/WebContent/help/crm/Crm_jobtitlesEditPage.help.html viewpoint/WebContent/help/crm/Crm_function_rolesEditPage.help.html</div><div>R viewpoint/WebContent/help/crm/Crm_jobtitlesLovPage.help.html viewpoint/WebContent/help/crm/Crm_function_rolesLovPage.help.html</div>
<div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesEditPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesEditPage.jsp</div><div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesEditPage.jspf viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesEditPage.jspf</div>
<div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesLovPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesLovPage.jsp</div><div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesMainPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesMainPage.jsp</div>
<div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesMenuPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesMenuPage.jsp</div><div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesSubmitPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesSubmitPage.jsp</div>
<div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesViewPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesViewPage.jsp</div><div>R viewpoint/src/iRed/Red/Maintenance/crm_jobtitlesBean.java viewpoint/src/iRed/Red/Maintenance/Crm_function_rolesBean.java</div>
<div>D viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesInfoWorkflows.jsp</div><div>M 644 inline viewpoint/Oracle/tabledata/20121113_ENDL_rename_jobtitles.sql</div><div><br></div><div>----- fragment two ------</div>
<div><br></div><div>commit refs/heads/4.2</div><div>mark :20570</div><div>committer Puzzler <<a href="mailto:puzzler@itris.nl" target="_blank">puzzler@itris.nl</a>> 1358155708 +0100</div><div>data 91</div><div>Merged 1081: call 38972 (Andjelko Visekruna): Authorization project - Authorization project</div>
<div>from :20569</div><div>R viewpoint/WebContent/help/crm/Crm_jobtitlesEditPage.help.html viewpoint/WebContent/help/crm/Crm_function_rolesEditPage.help.html</div><div>R viewpoint/WebContent/help/crm/Crm_jobtitlesLovPage.help.html viewpoint/WebContent/help/crm/Crm_function_rolesLovPage.help.html</div>
<div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesEditPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesEditPage.jsp</div><div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesEditPage.jspf viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesEditPage.jspf</div>
<div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesLovPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesLovPage.jsp</div><div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesMainPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesMainPage.jsp</div>
<div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesMenuPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesMenuPage.jsp</div><div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesSubmitPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesSubmitPage.jsp</div>
<div>R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesViewPage.jsp viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesViewPage.jsp</div><div>R viewpoint/src/iRed/Red/Maintenance/crm_jobtitlesBean.java viewpoint/src/iRed/Red/Maintenance/Crm_function_rolesBean.java</div>
<div>D viewpoint/Oracle/triggers/crm_cst_brd.trg</div><div>D viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesInfoWorkflows.jsp</div><div>D viewpoint/WebContent/iRed/Red/Maintenance/crm_job_personsEditPage.jsp</div>
<div>D viewpoint/WebContent/iRed/Red/Maintenance/crm_job_personsSubmitPage.jsp</div><div>D viewpoint/WebContent/iRed/Red/Maintenance/crm_job_personsViewPage.jsp</div><div>D viewpoint/src/iRed/Dsn/PrepareMidoffice.java</div>
<div><br></div><div>--------</div><div>It's the second fragment which causes the import to crash, according to git fast-import.</div><div><br></div><div>The actual history shows that the 2nd fragment is the "main" commit which contains the first fragment as a "sub" commit.</div>
</div><div><br></div><div>Can anyone shed some light on how to solve this?</div><div><br></div><div>Thanks,</div><div><br></div><div>Frits</div><div><br></div></div></div></div>
</blockquote></div>