aboutsummaryrefslogtreecommitdiff
path: root/t/t9159-git-svn-no-parent-mergeinfo.sh
Commit message (Collapse)AuthorAge
* t9159-*.sh: skip for mergeinfo test for svn <= 1.4Ramsay Jones2011-09-21
| | | | | | | | | | t9159 relies on the command-line syntax of svn >= 1.5. Given the declining install base of older svn versions, it is not worth our time to support older svn syntax. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-svn: Correctly handle root commits in mergeinfo rangesMichael Haggerty2011-06-28
| | | | | | | | | | | If the bottom of a mergeinfo range is a commit that maps to a git root commit, then it doesn't have a parent. In such a case, use git commit range "$top_commit" rather than "$bottom_commit^..$top_commit". [ew: line-wrap at 80 columns] Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net>
* git-svn: Demonstrate a bug with root commits in mergeinfo rangesMichael Haggerty2011-06-28
If a svn:mergeinfo range starts at a commit that was converted as a git root commit (e.g., r1 or a branch that was created out of thin air), then there is an error when git-svn tries to run git rev-list "$bottom_commit^..$top_commit" because $bottom_commit (the git commit corresponding to r1) has no parent. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net>