Handling of merges that contained empty directories

[baudren]

Hello,

we have the following situation:

• a commit on an SVN branch introduced two empty directories.
• this branch is later merged on the trunk

Applying the svn2git tool with the option --empty-dirs, the commit on the SVN branch added, as expected, two .gitignore files.

However, the subsequent merge commits did not carry this information, and I sort-of see the point: only the content of the SVN merge commit got transcribed and reproduced, but it creates this weird situation where the master (ex trunk) does not contain exactly the same content at the other branch, despite having done a merge.

Would there be any work-around on this? The easy solution is to reperform the merge, at the end of the migration, where this time the empty .gitignore will be picked, but if there would be a cleaner way, that would be nice.

Thanks in advance, and thank you for the tool!

[tnyblom]

Hi,

Thanks for the report, but this project is not really maintained any longer so unless someone provides a patch the chance of a fix is unfortunately quite low.

/Cheers
Torgny

[itineric]

Hi,

Had the same issue during my migration, fixed it. See PR #78 .
Fix works in my case, hope it works in yours too.

Eric

[Vampire]

can this be closed then?