Package: svn-buildpackage
Version: 0.6.9
Severity: minor
Tags: patch
In case of conflicts, svn-upgrade prints a message with asking to use
"svn resolve" command. The actual command is "svn resolved".
Regards,
-- System Information:
Debian Release: testing/unstable
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1,
'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.10-elrond-01
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15) (ignored:
LC_ALL set to [EMAIL PROTECTED])
Versions of packages svn-buildpackage depends on:
ii devscripts 2.8.14 Scripts to make the life of a Debi
ii perl 5.8.7-3 Larry Wall's Practical Extraction
ii subversion 1.1.4-2 advanced version control system (a
ii subversion-tools 1.1.4-2 assorted tools related to Subversi
svn-buildpackage recommends no packages.
-- no debconf information
diff -ru svn-buildpackage-0.6.9.orig/svn-upgrade
svn-buildpackage-0.6.9/svn-upgrade
--- svn-buildpackage-0.6.9.orig/svn-upgrade 2005-06-13 23:20:10.000000000
+0200
+++ svn-buildpackage-0.6.9/svn-upgrade 2005-07-30 16:14:31.210144600 +0200
@@ -270,7 +270,7 @@
map {s/^..//} @conflicts;
if ($#conflicts != -1) {
print "Files in conflict state:\n\n @conflicts\n";
- print "Resolve them manually and run \"svn resolve\" on each file\n.",
+ print "Resolve them manually and run \"svn resolved\" on each file\n.",
"Or use \"svn-upgrade -r\" to overwrite them with new upstream
verions\n";
}
withecho("rm", "-rf", $tmpdir) if(length($tmpdir));
