Package: svn-buildpackage
Severity: minor
Tags: patch
Hi,
reading the howto it was not clear for me how to avoid the
mergeWithUpstream feature.
Please consider the attached patch, which briefly tries to explain how
to unset it and fixes a small typo.
ciao,
ema
--- - 2005-02-01 23:35:57.000000000 +0100
+++ /tmp/HOWTOsgml.gz.20624 2005-02-01 23:35:57.000000000 +0100
@@ -419,7 +419,7 @@
A special feature of svn-buildpackage is so called
mergeWithUpstream-mode. Many projects do not want to keep the whole upstream
source under
revision control, eg. because of the large amount of required disc space
-and process time. Sometimes it makes sence to keep only the
+and process time. Sometimes it makes sense to keep only the
<tt>debian/</tt> directory any maybe few other files under revision
control.
<p>
@@ -443,6 +443,9 @@
remove the files not changed in the Debian package from both upstream
source and Debian branch (<tt>svn rm</tt>) and set the mergeWithUpstream
property in the
<tt>trunk</tt> directory with <tt>svn propset mergeWithUpstream 1</tt>.
+<p>
+If you actually decide to stop using the mergeWithUpstream-mode, unset the
+mergeWithUpstream property as follows: <tt>svn propdel mergeWithUpstream
debian/</tt>.
</sect>
<!--sect>Importing directories
