Skip to content

Commit

Permalink
cvsimport: extend testcase about patchset order to contain branches
Browse files Browse the repository at this point in the history
This makes sure that timestamps and ordering on branches is not influenced
by a fix for cvsps.

The test extension does not deal which patchset correction on branches it
only verifes that branches are basically handled as before.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Heiko Voigt authored and Junio C Hamano committed Mar 21, 2009
1 parent 9291ccf commit 3867906
Show file tree
Hide file tree
Showing 4 changed files with 103 additions and 11 deletions.
17 changes: 12 additions & 5 deletions t/t9603-cvsimport-patchsets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,20 @@ test_expect_failure 'import with criss cross times on revisions' '
git cvsimport -p"-x" -C module-git module &&
cd module-git &&
git log --pretty=format:%s > ../actual &&
echo "" >> ../actual &&
git log --pretty=format:%s > ../actual-master &&
git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
echo "" >> ../actual-master &&
echo "" >> ../actual-A &&
cd .. &&
echo "Rev 3
echo "Rev 4
Rev 3
Rev 2
Rev 1" > expect &&
test_cmp actual expect
Rev 1" > expect-master &&
test_cmp actual-master expect-master &&
echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
test_cmp actual-A expect-A
'

test_done
1 change: 1 addition & 0 deletions t/t9603/cvsroot/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* -whitespace
38 changes: 36 additions & 2 deletions t/t9603/cvsroot/module/a,v
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
head 1.2;
access;
symbols;
symbols
A:1.2.0.2;
locks; strict;
comment @# @;


1.2
date 2009.02.21.18.11.14; author tester; state Exp;
branches;
branches
1.2.2.1;
next 1.1;

1.1
date 2009.02.21.18.11.43; author tester; state Exp;
branches;
next ;

1.2.2.1
date 2009.03.11.19.03.52; author tester; state Exp;
branches;
next 1.2.2.2;

1.2.2.2
date 2009.03.11.19.09.10; author tester; state Exp;
branches;
next ;


desc
@@
Expand All @@ -29,6 +41,28 @@ text
@


1.2.2.1
log
@Rev 4 Branch A
@
text
@d1 1
a1 1
1.2.2.1
@


1.2.2.2
log
@Rev 5 Branch A
@
text
@d1 1
a1 1
1.2.2.2
@


1.1
log
@Rev 1
Expand Down
58 changes: 54 additions & 4 deletions t/t9603/cvsroot/module/b,v
Original file line number Diff line number Diff line change
@@ -1,31 +1,81 @@
head 1.2;
head 1.3;
access;
symbols;
symbols
A:1.2.0.2;
locks; strict;
comment @# @;


1.3
date 2009.03.11.19.05.08; author tester; state Exp;
branches;
next 1.2;

1.2
date 2009.02.21.18.11.43; author tester; state Exp;
branches;
branches
1.2.2.1;
next 1.1;

1.1
date 2009.02.21.18.11.14; author tester; state Exp;
branches;
next ;

1.2.2.1
date 2009.03.11.19.03.52; author tester; state Exp;
branches;
next 1.2.2.2;

1.2.2.2
date 2009.03.11.19.09.10; author tester; state Exp;
branches;
next ;


desc
@@


1.3
log
@Rev 4
@
text
@1.3
@


1.2
log
@Rev 3
@
text
@1.2
@d1 1
a1 1
1.2
@


1.2.2.1
log
@Rev 4 Branch A
@
text
@d1 1
a1 1
1.2.2.1
@


1.2.2.2
log
@Rev 5 Branch A
@
text
@d1 1
a1 1
1.2
@


Expand Down

0 comments on commit 3867906

Please sign in to comment.