From: Russell Bryant Date: Sun, 23 Jul 2006 02:50:25 +0000 (+0000) Subject: update to mention svn instead of cvs X-Git-Tag: 1.4.0-beta1~533 X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=commitdiff_plain;h=8f08d7cc13c2d67b99ad4e0045513d921afc3c57;ds=sidebyside update to mention svn instead of cvs git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38089 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/doc/CODING-GUIDELINES b/doc/CODING-GUIDELINES index b68a200..85f94fc 100644 --- a/doc/CODING-GUIDELINES +++ b/doc/CODING-GUIDELINES @@ -14,17 +14,15 @@ To be accepted into the codebase, all non-trivial changes must be disclaimed to Digium or placed in the public domain. For more information see http://bugs.digium.com -Patches should be in the form of a unified (-u) diff, made from the directory -above the top-level Asterisk source directory. For example: +Patches should be in the form of a unified (-u) diff, made from a checkout +from subversion. -- the base code you are working from is in ~/work/asterisk-base -- the changes are in ~/work/asterisk-new +/usr/src/asterisk$ svn diff > mypatch -~/work$ diff -urN asterisk-base asterisk-new +If you would like to only include changes to certain files in the patch, you +can list them in the "svn diff" command: -If you are changing within a fresh CVS/SVN repository, you can create -a patch with -$ cvs diff -urN .c +/usr/src/asterisk$ svn diff somefile.c someotherfile.c > mypatch * General rules ---------------