path: root/t/
AgeCommit message (Collapse)Author
2010-11-09tests: add missing &&Jonathan Nieder
Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Commands intended to fail should be marked with !, test_must_fail, or test_might_fail. The examples in this patch do not require that. Signed-off-by: Jonathan Nieder <> Signed-off-by: Junio C Hamano <>
2010-03-13t9150,t9151: Add rewrite-root option to initTuomas Suutari
The rewrite-root option seems to be a bit problematic with merge detecting, so it's better to have a merge detecting test with it turned on. Signed-off-by: Tuomas Suutari <> Acked-by: Eric Wong <>
2010-02-26git-svn: Fix discarding of extra parents from svn:mergeinfoTuomas Suutari
If parent J is an ancestor of parent I, then parent J should be discarded, not I. Note that J is an ancestor of I if and only if rev-list I..J is emtpy, which is what we are testing here. Signed-off-by: Tuomas Suutari <> Acked-by: Eric Wong <>
2010-02-26t9151: Add two new svn:mergeinfo test casesTuomas Suutari
When svn:mergeinfo contains two new parents in a specific order and one is ancestor of the other, it is possible that git-svn discards the wrong one. The first test case ("commit made to merged branch is reachable from the merge") proves this. The second test case ("merging two branches in one commit is detected correctly") is just for completeness, since there was no test for merging two (feature) branches to trunk in one commit. Signed-off-by: Tuomas Suutari <> Acked-by: Eric Wong <>
2010-01-23git-svn: update svn mergeinfo test suiteAndrew Myrick
Add a partial branch (e.g., a branch from a project subdirectory) to the git-svn mergeinfo test repository. Add a tag and a branch from that tag to the git-svn mergeinfo test repository. Update the test script to expect a known failure in git-svn exposed by these additions where merge info for partial branches is not preserved. Signed-off-by: Andrew Myrick <> Acked-by: Eric Wong <>
2009-12-21git-svn: detect cherry-picks correctly.Sam Vilain
The old function was incorrect; in some instances it marks a cherry picked range as a merged branch (because of an incorrect assumption that 'rev-list COMMIT --not RANGE' would work). This is replaced with a function which should detect them correctly, memoized to limit the expense of dealing with branches with many cherry picks to one 'merge-base' call per merge, per branch which used cherry picking. Signed-off-by: Sam Vilain <> Acked-by: Eric Wong <>
2009-12-21git-svn: fix some mistakes with interpreting SVN mergeinfo commit rangesSam Vilain
SVN's list of commit ranges in mergeinfo tickets is inclusive, whereas git commit ranges are exclusive on the left hand side. Also, the end points of the commit ranges may not exist; they simply delineate ranges of commits which may or may not exist. Fix these two mistakes. Signed-off-by: Sam Vilain <> Acked-by: Eric Wong <>
2009-12-21git-svn: expand the svn mergeinfo test suite, highlighting some failuresSam Vilain
As shown, git-svn has some problems; not all svn merges are correctly detected, and cherry picks may incorrectly be detected as real merges. These test cases will be marked as _success once the relevant fixes are in. Signed-off-by: Sam Vilain <> Acked-by: Eric Wong <>
2009-11-14git svn: handle SVN merges from revisions past the tip of the branchToby Allsopp
When recording the revisions that it has merged, SVN sets the top revision to be the latest revision in the repository, which is not necessarily a revision on the branch that is being merged from. When it is not on the branch, git-svn fails to add the extra parent to represent the merge because it relies on finding the commit on the branch that corresponds to the top of the SVN merge range. In order to correctly handle this case, we look for the maximum revision less than or equal to the top of the SVN merge range that is actually on the branch being merged from. [ew: This includes the following (squashed) commit to prevent errors during bisect:] Author: Toby Allsopp <> Date: Fri Nov 13 09:48:39 2009 +1300 git-svn: add (failing) test for SVN 1.5+ merge with intervening commit This test exposes a bug in git-svn's handling of SVN 1.5+ mergeinfo properties. The problematic case is when there is some commit on an unrelated branch after the last commit on the merged-from branch. When SVN records the mergeinfo property, it records the latest revision in the whole repository, which, in the problematic case, is not on the branch it is merging from. To trigger the git-svn bug, we modify t9151 to include two SVN merges, the second of which has an intervening commit. The SVN dump was generated using SVN 1.6.6 (on Debian squeeze amd64). Signed-off-by: Toby Allsopp <> Acked-by: Eric Wong <>
2009-10-30t915{0,1}: use $TEST_DIRECTORYJeff King
Because --root can put our trash directories elsewhere, using ".." may not always work. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2009-10-30Make t9150 and t9151 test scripts executableMichael J Gruber
so that they can be run individually as (cd t && ./ etc. just like all other test scripts. Signed-off-by: Michael J Gruber <> Signed-off-by: Junio C Hamano <>
2009-10-27git-svn: convert SVN 1.5+ / svn:mergeinfo props to parentsSam Vilain
This feature is long overdue; convert SVN's merge representation to git's as revisions are imported. This works by converting the list of revisions in each line of the svn:mergeinfo into git revision ranges, and then checking the latest of each of these revision ranges for A) being new and B) now being completely merged. Signed-off-by: Sam Vilain <> Acked-by: Eric Wong <>