summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Florian Achleitner <florian.achleitner.2.6.31@gmail.com>2012-09-19 17:21:29 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-10-07 14:10:17 -0700
commit5bfc76b5b275bbf0ddc2cf1a3a33fa6156addbd8 (patch)
tree381270c543a199082dab222c5854c65b0798b815 /ll-merge.c
parentAdd a svnrdump-simulator replaying a dump file for testing (diff)
downloadtgif-5bfc76b5b275bbf0ddc2cf1a3a33fa6156addbd8.tar.xz
remote-svn: add marks-file regeneration
fast-import mark files are stored outside the object database and are therefore not fetched and can be lost somehow else. marks provide a svn revision --> git sha1 mapping, while the notes that are attached to each commit when it is imported provide a git sha1 --> svn revision mapping. If the marks file is not available or not plausible, regenerate it by walking through the notes tree. , i.e. The plausibility check tests if the highest revision in the marks file matches the revision of the top ref. It doesn't ensure that the mark file is completely correct. This could only be done with an effort equal to unconditional regeneration. Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com> Acked-by: David Michael Barr <b@rr-dav.id.au> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions