At Sun Nov 29 02:28:39 -0500 2009, Alex Vandiver wrote: > While converting a mildly complicated svn repository that was managed > with SVK, I ran across the following oddness. `svk smerge` can only > merge between _two_ branches at once -- however, the way that svk > merge detection works, you can end up with erroneous extra parents > from long-dead branches. Upon a little more inspection, I now understand that the rev-parse lines in find_extra_svk_parents are attempting to deal with this exact circumstance -- but they fail to properly sort the merge tickets first, which leads to this incorrect behavior. Armed with this understanding, I'm more confident in the attached updated patch. I assume, however, that the logic allows for more than one extra parent only because such an occurrance could be constructed by hand-editing svk:merge, because AFAIK svk's command-line tools should be able to construct such a circumstance. - Alex -- Networking -- only one letter away from not working
Attachment:
0001-git-svn-sort-svk-merge-tickets-to-account-for-minima.patch
Description: Binary data