From: Heiko Voigt <git-list@hvoigt.net>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: Junio C Hamano <gitster@pobox.com>,
ydirson@altern.org, git@vger.kernel.org
Subject: [PATCH v3 2/2] cvsimport: extend testcase about patchset order to contain branches
Date: Wed, 18 Mar 2009 18:33:41 +0100 [thread overview]
Message-ID: <49C13075.7060307@hvoigt.net> (raw)
In-Reply-To: <49B52F74.1090006@alum.mit.edu>
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>
---
t/t9603-cvsimport-patchsets.sh | 19 +++++++++----
t/t9603/cvsroot/.gitattributes | 1 +
t/t9603/cvsroot/module/a,v | 38 ++++++++++++++++++++++++-
t/t9603/cvsroot/module/b,v | 58 +++++++++++++++++++++++++++++++++++++---
4 files changed, 104 insertions(+), 12 deletions(-)
create mode 100644 t/t9603/cvsroot/.gitattributes
diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
index 15a971f..2511b69 100755
--- a/t/t9603-cvsimport-patchsets.sh
+++ b/t/t9603-cvsimport-patchsets.sh
@@ -17,17 +17,24 @@ test_description='git cvsimport testing for correct patchset estimation'
CVSROOT="$TEST_DIRECTORY"/t9603/cvsroot
export CVSROOT
-test_expect_failure 'import with criss cross times on revisions' '
+test_expect_success '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
diff --git a/t/t9603/cvsroot/.gitattributes b/t/t9603/cvsroot/.gitattributes
new file mode 100644
index 0000000..562b12e
--- /dev/null
+++ b/t/t9603/cvsroot/.gitattributes
@@ -0,0 +1 @@
+* -whitespace
diff --git a/t/t9603/cvsroot/module/a,v b/t/t9603/cvsroot/module/a,v
index e86adfc..ba8fd5a 100644
--- a/t/t9603/cvsroot/module/a,v
+++ b/t/t9603/cvsroot/module/a,v
@@ -1,13 +1,15 @@
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
@@ -15,6 +17,16 @@ 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
@@
@@ -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
diff --git a/t/t9603/cvsroot/module/b,v b/t/t9603/cvsroot/module/b,v
index ab3089f..d268855 100644
--- a/t/t9603/cvsroot/module/b,v
+++ b/t/t9603/cvsroot/module/b,v
@@ -1,13 +1,20 @@
-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
@@ -15,17 +22,60 @@ 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
@
--
1.6.1.2.390.gba743
next prev parent reply other threads:[~2009-03-18 17:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-23 18:49 [PATCH] cvsimport: add test illustrating a bug in cvsps Heiko Voigt
2009-02-23 20:35 ` Heiko Voigt
2009-02-24 5:00 ` Michael Haggerty
2009-03-02 17:59 ` [PATCH v2 0/1] " Heiko Voigt
2009-03-02 17:59 ` [PATCH v2 1/1] " Heiko Voigt
2009-03-09 11:26 ` [CVSPS PATCH] fix: correct rev order in case commiters clocks were not syncronised Heiko Voigt
2009-03-09 15:02 ` Michael Haggerty
2009-03-18 17:33 ` [PATCH v3 0/2] cvsimport: add test illustrating a bug in cvsps Heiko Voigt
2009-03-18 18:22 ` Junio C Hamano
2009-03-19 10:41 ` Michael J Gruber
2009-03-19 11:00 ` Johannes Schindelin
2009-03-19 11:22 ` Michael J Gruber
2009-03-21 5:41 ` Michael Haggerty
2009-03-23 18:11 ` started a cvsps testsuite Was: " Heiko Voigt
2009-03-23 19:06 ` Martin Langhoff
2009-03-24 4:50 ` Michael Haggerty
2009-04-06 19:01 ` Heiko Voigt
2009-03-23 17:47 ` Heiko Voigt
2009-03-18 17:33 ` [PATCH v3 1/2] " Heiko Voigt
2009-03-18 17:33 ` Heiko Voigt [this message]
2009-03-18 17:34 ` [CVSPS PATCH v2] fix: correct rev order in case commiters clocks were not syncronised Heiko Voigt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49C13075.7060307@hvoigt.net \
--to=git-list@hvoigt.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=ydirson@altern.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).