Index: Doc/dist/dist.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/dist/dist.tex,v
retrieving revision 1.87
diff -u -r1.87 dist.tex
--- Doc/dist/dist.tex	1 Jan 2005 00:28:29 -0000	1.87
+++ Doc/dist/dist.tex	4 Jan 2005 14:03:40 -0000
@@ -1119,6 +1119,7 @@
 \begin{itemize}
 \item all files in the Distutils ``build'' tree (default \file{build/})
 \item all files in directories named \file{RCS}, \file{CVS} or \file{.svn}
+\item all files starting with \file{.#}, which resemble CVS conflict files.
 \end{itemize}
 Now we have our complete list of files, which is written to the manifest
 for future reference, and then used to build the source distribution
@@ -1152,6 +1153,7 @@
   \code{recursive-include} command
 \item exclude the entire \file{build} tree, and any \file{RCS},
   \file{CVS} and \file{.svn} directories
+\item exclude files starting with \file{.#}
 \end{enumerate}
 Just like in the setup script, file and directory names in the manifest
 template should always be slash-separated; the Distutils will take care
Index: Lib/distutils/command/sdist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/sdist.py,v
retrieving revision 1.59
diff -u -r1.59 sdist.py
--- Lib/distutils/command/sdist.py	10 Nov 2004 22:23:15 -0000	1.59
+++ Lib/distutils/command/sdist.py	4 Jan 2005 14:03:49 -0000
@@ -348,6 +348,7 @@
           * the release tree itself (only an issue if we ran "sdist"
             previously with --keep-temp, or it aborted)
           * any RCS, CVS and .svn directories
+          * CVS conflict files (starting with '.#')
         """
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
@@ -355,6 +356,7 @@
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
         self.filelist.exclude_pattern(r'/(RCS|CVS|\.svn)/.*', is_regex=1)
+        self.filelist.exclude_pattern(r'\.#.*', is_regex=1)
 
 
     def write_manifest (self):