From: Heiko Voigt <hvoigt@hvoigt.net>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH v2] Cleanup warning about known issues in cvsimport documentation
Date: Wed, 1 Apr 2009 22:24:28 +0200 [thread overview]
Message-ID: <20090401202415.GA90837@macbook.lan> (raw)
In-Reply-To: <20090331194940.GB23184@coredump.intra.peff.net>
Not all statements were complete sentences.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
---
I corrected the typos. This is the interdiff:
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index ba6a50b..d7bab13 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -176,7 +176,7 @@ Problems related to timestamps:
to be used for ordering commits changes may show up in the wrong
order.
* If any files were ever "cvs import"ed more than once (e.g., import of
- more than one vendor release) the HEAD will be incorrect.
+ more than one vendor release) the HEAD contains the wrong content.
* If the timestamp order of different files cross the revision order
within the commit matching time window the order of commits may be
wrong.
@@ -187,7 +187,7 @@ Problems related to branches:
* All files from the branching point are added to a branch even if
never added in cvs.
* This applies to files added to the source branch *after* a daughter
- branch was created: If previously no commit was made on the daugther
+ branch was created: if previously no commit was made on the daughter
branch they will erroneously be added to the daughter branch in git.
Problems related to tags:
Documentation/git-cvsimport.txt | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index e1fd047..d7bab13 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -173,24 +173,26 @@ ISSUES
Problems related to timestamps:
* If timestamps of commits in the cvs repository are not stable enough
- to be used for ordering commits
+ to be used for ordering commits changes may show up in the wrong
+ order.
* If any files were ever "cvs import"ed more than once (e.g., import of
- more than one vendor release)
+ more than one vendor release) the HEAD contains the wrong content.
* If the timestamp order of different files cross the revision order
- within the commit matching time window
+ within the commit matching time window the order of commits may be
+ wrong.
Problems related to branches:
- * Branches on which no commits have been made are not imported
+ * Branches on which no commits have been made are not imported.
* All files from the branching point are added to a branch even if
- never added in cvs
- * files added to the source branch *after* a daughter branch was
- created: If previously no commit was made on the daugther branch they
- will erroneously be added to the daughter branch in git
+ never added in cvs.
+ * This applies to files added to the source branch *after* a daughter
+ branch was created: if previously no commit was made on the daughter
+ branch they will erroneously be added to the daughter branch in git.
Problems related to tags:
-* Multiple tags on the same revision are not imported
+* Multiple tags on the same revision are not imported.
If you suspect that any of these issues may apply to the repository you
want to import consider using these alternative tools which proved to be
--
1.6.2.1.424.g0b27.dirty
next prev parent reply other threads:[~2009-04-01 20:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-23 19:53 [PATCH] Add warning about known issues to documentation of cvsimport Heiko Voigt
2009-03-23 20:33 ` Ferry Huberts (Pelagic)
2009-03-30 22:17 ` Heiko Voigt
2009-03-31 5:36 ` Ferry Huberts (Pelagic)
2009-03-31 16:22 ` Heiko Voigt
2009-03-31 16:53 ` [PATCH] cvsimport: Add a note about crlf options to the documentation Heiko Voigt
2009-03-31 17:10 ` [PATCH] Add warning about known issues to documentation of cvsimport Ferry Huberts (Pelagic)
2009-03-24 3:14 ` Jeff King
2009-03-30 22:36 ` Heiko Voigt
2009-03-31 0:51 ` Junio C Hamano
2009-03-31 16:45 ` [PATCH] Cleanup warning about known issues in cvsimport documentation Heiko Voigt
2009-03-31 19:49 ` Jeff King
2009-04-01 20:24 ` Heiko Voigt [this message]
2009-03-31 11:28 ` [PATCH] Add warning about known issues to documentation of cvsimport Jeff King
2009-03-31 19:40 ` Jeff King
2009-03-31 23:55 ` Junio C Hamano
2009-04-01 8:50 ` [PATCH] Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set Chris Johnsen
2009-04-01 10:14 ` Jeff King
2009-04-02 5:25 ` Junio C Hamano
2009-04-01 10:34 ` Jeff King
2009-04-01 12:19 ` Chris Johnsen
2009-04-01 13:06 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090401202415.GA90837@macbook.lan \
--to=hvoigt@hvoigt.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).