summaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2009-02-23 06:08:13 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-23 21:56:47 -0800
commitb225290445210bbdef207e42de21edbf8baa24aa (patch)
tree1cd578324e842479470ea61e9b7bc2e19497db4c /rerere.h
parentTest contents of entire cvsimported "master" tree contents (diff)
downloadtgif-b225290445210bbdef207e42de21edbf8baa24aa.tar.xz
Add some tests of git-cvsimport's handling of vendor branches
CVS's handling of vendor branches is tricky; add some tests to check whether revisions added via "cvs imports" then imported to git via "git cvsimport" are reflected correctly on master. One of these tests fail and is therefore marked "test_expect_failure". Cvsimport doesn't realize that subsequent changes on a vendor branch affect master as long as the vendor branch is the default branch. The test CVS repository used for these tests is derived from cvs2svn's test suite. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions