cvs commit: de-docproj/articles/contributing-ports article.sgml

From: Johann Kois <jkois(at)doc.bsdgroup.de>
Date: Sat, 8 Oct 2011 18:29:04 GMT

jkois 2011-10-08 18:29:04 UTC

  FreeBSD German Documentation Repository

  Modified files:
    articles/contributing-ports article.sgml
  Log:
  Wieder mal: Expandiertes $FreeBSD$ im deutschen Repo? Nö. Nee. Nixdo. Nein. Niemals. Nie. Nicht. :)
  
  Sonst gibts sowas wie das da beim Commit auf freefall:
  
  article.sgml - GRRR!! You spammed your copy of the file
      which was based upon version 1.4, with a different version based
      upon 1.3. Please move your 'doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml' out of the way,
      perform an update to get the current version, and then
      CAREFULLY merge your changes into that file.
  
  commit_prep.pl failed!
  cvs commit: Pre-commit check failed
  cvs [commit aborted]: correct above errors first!
  cvs commit: saving log message in /tmp/cvsHzDqmh
  
  Revision Changes Path
  1.10 +1 -1 de-docproj/articles/contributing-ports/article.sgml
  
  Index: article.sgml
  ===================================================================
  RCS file: /home/cvs/de-docproj/articles/contributing-ports/article.sgml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -I$FreeBSDde.*$ -r1.9 -r1.10
  --- article.sgml 3 Sep 2011 15:54:42 -0000 1.9
  +++ article.sgml 8 Oct 2011 18:29:04 -0000 1.10
  @@ -1,8 +1,8 @@
   <!-- The FreeBSD Documentation Project
        The FreeBSD German Documentation Project
   
  - $FreeBSD: doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml,v 1.3 2007/10/19 09:56:47 jkois Exp $
  - $FreeBSDde: de-docproj/articles/contributing-ports/article.sgml,v 1.9 2011/09/03 15:54:42 bcr Exp $
  + $FreeBSD$
  + $FreeBSDde: de-docproj/articles/contributing-ports/article.sgml,v 1.10 2011/10/08 18:29:04 jkois Exp $
        basiert auf: 1.6
        -->
   
  

To Unsubscribe: send mail to majordomo(at)de.FreeBSD.org
with "unsubscribe de-cvs-doc" in the body of the message
Received on Sat 08 Oct 2011 - 20:29:20 CEST

search this site