summaryrefslogtreecommitdiff
path: root/t/t9157-git-svn-fetch-merge.sh
AgeCommit message (Collapse)Author
2011-01-11t9157-*.sh: Make the svn version check more preciseRamsay Jones
These tests require an svn version 1.5 or newer to run correctly. In particular, all 1.4.x versions and earlier are too old, so fix up the case label regex to cover this range exactly. [Fix provided by Anders Kaseorg <andersk@MIT.EDU>] Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-01-07t9157-*.sh: Add an svn version checkRamsay Jones
Acked-by: Eric Wong <normalperson@yhbt.net> Acked-by: Steven Walter <stevenrwalter@gmail.com> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
2010-10-06Make test script t9157 executableJunio C Hamano
Fixes a buglet introduced by a3c75056d Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-09-24git-svn: check_cherry_pick should exclude commits already in our historySteven Walter
The merge-base between @$parents and $merge_tip may have been reached through a merge commit. This means that some commits that are ancestors of @$parents will not be ancestors of $merge_base. The mergeinfo property will not list commits that are ancestors of @$parents, so we need to explicitly exclude them. [ew: squashed and cleaned up test case from Steven] Signed-off-by: Steven Walter <stevenrwalter@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>