summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Vitor Antunes <vitor.hda@gmail.com>2012-01-25 23:48:22 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-26 11:34:40 -0800
commitfed23693ba1a1ea7beb851cd385d458136e91664 (patch)
tree5063848b6da4bc2269807dad2e67a4b56d5089c4 /t/t7610-mergetool.sh
parentgit-p4: label import fails with multiple labels at the same changelist (diff)
downloadtgif-fed23693ba1a1ea7beb851cd385d458136e91664.tar.xz
git-p4: Search for parent commit on branch creation
To find out which is its parent the commit of the new branch is compared sequentially to each blob of the parent branch from the newest to the oldest. The first blob which results in a zero diff is considered the parent commit. If none is found, then the commit is applied to the top of the parent branch. A fast-import "checkpoint" call is required because diff-tree is only able to work with blobs on disk. But most of these commits will not be part of the final imported tree, making fast-import fail. To avoid this, the temporary branches are tracked and then removed at the end of the import process. Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions