Problem exporting to git

[Frits Jalvingh]

Yeah, the output as shown above shows the same rename two times, once in
the "toplevel" merge and again in the merge that is part of that "toplevel"
merge. I suppose it is that what is causing the trouble. I am not that sure
how to fix it, but apparently I'll need to become more of an expert to
prevent my history to be lost 8-/

Anyway, thanks for your help. I'll try to find the best way to handle stuff.


On Sun, Mar 2, 2014 at 3:14 AM, John Meinel <john at arbash-meinel.com> wrote:

> 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.
> 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.
> 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.
>
> John
> =:->
> On Feb 25, 2014 11:53 PM, "Frits Jalvingh" <jal at etc.to> wrote:
>
>> Hello list,
>>
>> 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:
>>
>> git fast-import failed: fatal: Path
>> viewpoint/WebContent/help/crm/Crm_jobtitlesEditPage.help.html not in branch
>>
>> Looking in the export file I see the following two segments:
>>
>> ----- fragment one ------
>> commit refs/heads/4.2
>> mark :20503
>> committer <leo.van.der.ende at itris.nl> 1352820423 +0100
>> data 14
>> user story A05
>> from :20502
>> R viewpoint/WebContent/help/crm/Crm_jobtitlesEditPage.help.html
>> viewpoint/WebContent/help/crm/Crm_function_rolesEditPage.help.html
>> R viewpoint/WebContent/help/crm/Crm_jobtitlesLovPage.help.html
>> viewpoint/WebContent/help/crm/Crm_function_rolesLovPage.help.html
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesEditPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesEditPage.jsp
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesEditPage.jspf
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesEditPage.jspf
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesLovPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesLovPage.jsp
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesMainPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesMainPage.jsp
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesMenuPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesMenuPage.jsp
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesSubmitPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesSubmitPage.jsp
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesViewPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesViewPage.jsp
>> R viewpoint/src/iRed/Red/Maintenance/crm_jobtitlesBean.java
>> viewpoint/src/iRed/Red/Maintenance/Crm_function_rolesBean.java
>> D viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesInfoWorkflows.jsp
>> M 644 inline viewpoint/Oracle/tabledata/20121113_ENDL_rename_jobtitles.sql
>>
>> ----- fragment two ------
>>
>> commit refs/heads/4.2
>> mark :20570
>> committer Puzzler <puzzler at itris.nl> 1358155708 +0100
>> data 91
>> Merged 1081: call 38972 (Andjelko Visekruna): Authorization project -
>> Authorization project
>> from :20569
>> R viewpoint/WebContent/help/crm/Crm_jobtitlesEditPage.help.html
>> viewpoint/WebContent/help/crm/Crm_function_rolesEditPage.help.html
>> R viewpoint/WebContent/help/crm/Crm_jobtitlesLovPage.help.html
>> viewpoint/WebContent/help/crm/Crm_function_rolesLovPage.help.html
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesEditPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesEditPage.jsp
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesEditPage.jspf
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesEditPage.jspf
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesLovPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesLovPage.jsp
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesMainPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesMainPage.jsp
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesMenuPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesMenuPage.jsp
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesSubmitPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesSubmitPage.jsp
>> R viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesViewPage.jsp
>> viewpoint/WebContent/iRed/Red/Maintenance/Crm_function_rolesViewPage.jsp
>> R viewpoint/src/iRed/Red/Maintenance/crm_jobtitlesBean.java
>> viewpoint/src/iRed/Red/Maintenance/Crm_function_rolesBean.java
>> D viewpoint/Oracle/triggers/crm_cst_brd.trg
>> D viewpoint/WebContent/iRed/Red/Maintenance/Crm_jobtitlesInfoWorkflows.jsp
>> D viewpoint/WebContent/iRed/Red/Maintenance/crm_job_personsEditPage.jsp
>> D viewpoint/WebContent/iRed/Red/Maintenance/crm_job_personsSubmitPage.jsp
>> D viewpoint/WebContent/iRed/Red/Maintenance/crm_job_personsViewPage.jsp
>> D viewpoint/src/iRed/Dsn/PrepareMidoffice.java
>>
>> --------
>> It's the second fragment which causes the import to crash, according to
>> git fast-import.
>>
>> The actual history shows that the 2nd fragment is the "main" commit which
>> contains the first fragment as a "sub" commit.
>>
>> Can anyone shed some light on how to solve this?
>>
>> Thanks,
>>
>> Frits
>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20140303/31f5c3f0/attachment.html>