[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

SVN HELP (was Re: r73892 - in trunk/src/debian-edu-config: . debian etc/debian-edu etc/ifplugd etc/samba/netlogon lib/mime/packages sbin)



Hi Petter,

On Mo 22 Aug 2011 08:48:33 CEST Petter Reinholdtsen wrote:

Author: mike-gabriel-guest
Date: 2011-08-22 06:22:45 +0000 (Mon, 22 Aug 2011)
New Revision: 73892

Modified:
   trunk/src/debian-edu-config/README.ldap
   trunk/src/debian-edu-config/debian/changelog
   trunk/src/debian-edu-config/etc/debian-edu/hd-warn.conf
   trunk/src/debian-edu-config/etc/ifplugd/ifplugd.action
   trunk/src/debian-edu-config/etc/samba/netlogon/login.bat
   trunk/src/debian-edu-config/lib/mime/packages/debian-edu-mailcap
   trunk/src/debian-edu-config/sbin/debian-edu-update-netblock
Log:
Fix debug message in debian-edu-update-netblock.

This commit do not match its commit message.  I suspect you want to
revert most of it, and recommit as individual changes.


I have tried to revert yesterday's faulty commit, but with 4 files I have a challenge here:

This is my filesystem diff between r73891 and 73892:

<quote difftype="diff">
diff --exclude=.svn -ur debian-edu/debian-edu-config/ debian-edu.73891/debian-edu-config/
Nur in debian-edu/debian-edu-config/: build.
diff '--exclude=.svn' -ur debian-edu/debian-edu-config//debian/changelog debian-edu.73891/debian-edu-config//debian/changelog --- debian-edu/debian-edu-config//debian/changelog 2011-08-23 09:23:02.000000000 +0200 +++ debian-edu.73891/debian-edu-config//debian/changelog 2011-08-23 10:51:26.000000000 +0200
@@ -15,7 +15,6 @@
   * Removal of home dirs: do not chown root:root the whole later-to-be-remove
     home dir tree, only chown root:root for home dir basefolder to block
     access.
-  * Fix debug message in debian-edu-update-netblock.

   [ Petter Reinholdtsen ]
   * Correct the Vcs-Browser link in the control file to use the new paths.
Nur in debian-edu/debian-edu-config//debian: files.
diff '--exclude=.svn' -ur debian-edu/debian-edu-config//etc/debian-edu/hd-warn.conf debian-edu.73891/debian-edu-config//etc/debian-edu/hd-warn.conf --- debian-edu/debian-edu-config//etc/debian-edu/hd-warn.conf 2011-08-23 09:23:03.000000000 +0200 +++ debian-edu.73891/debian-edu-config//etc/debian-edu/hd-warn.conf 2011-08-23 10:51:28.000000000 +0200
@@ -1,5 +1,5 @@
 # Config file for skolelinux-hd-warn
-# $Id: hd-warn.conf 73892 2011-08-22 06:22:45Z mike-gabriel-guest $
+# $Id: hd-warn.conf 418 2004-04-25 19:56:24Z pere $

 ALLOW="
 90 /usr
diff '--exclude=.svn' -ur debian-edu/debian-edu-config//etc/ifplugd/ifplugd.action debian-edu.73891/debian-edu-config//etc/ifplugd/ifplugd.action --- debian-edu/debian-edu-config//etc/ifplugd/ifplugd.action 2011-08-23 09:23:03.000000000 +0200 +++ debian-edu.73891/debian-edu-config//etc/ifplugd/ifplugd.action 2011-08-23 10:51:28.000000000 +0200
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: ifplugd.action 73892 2011-08-22 06:22:45Z mike-gabriel-guest $
+# $Id: ifplugd.action 63 2004-01-17 17:40:27Z pere $

 # This file is part of ifplugd.
 #
diff '--exclude=.svn' -ur debian-edu/debian-edu-config//lib/mime/packages/debian-edu-mailcap debian-edu.73891/debian-edu-config//lib/mime/packages/debian-edu-mailcap --- debian-edu/debian-edu-config//lib/mime/packages/debian-edu-mailcap 2011-08-23 09:23:03.000000000 +0200 +++ debian-edu.73891/debian-edu-config//lib/mime/packages/debian-edu-mailcap 2011-08-23 10:51:27.000000000 +0200
@@ -1,5 +1,5 @@
 # Global mailcap entries
-# $Id: debian-edu-mailcap 73892 2011-08-22 06:22:45Z mike-gabriel-guest $
+# $Id: debian-edu-mailcap 262 2004-03-01 15:56:46Z runesk-guest $

 # OpenOffice
 application/vnd.sun.xml.writer;ooffice %s
diff '--exclude=.svn' -ur debian-edu/debian-edu-config//sbin/debian-edu-update-netblock debian-edu.73891/debian-edu-config//sbin/debian-edu-update-netblock --- debian-edu/debian-edu-config//sbin/debian-edu-update-netblock 2011-08-23 09:23:03.000000000 +0200 +++ debian-edu.73891/debian-edu-config//sbin/debian-edu-update-netblock 2011-08-23 10:51:26.000000000 +0200
@@ -104,7 +104,7 @@

 stop_filtering() {
     if [ "$VERBOSE" != no ]; then
-       log_begin_msg "Deactivating network block on this host"
+       log_begin_msg "Activating network block on this host"
     fi
     iptables -P INPUT ACCEPT
     iptables -P OUTPUT ACCEPT
</quote>

When restoring the files from 73891 into the working copy of 73892 I get this as a result of svn diff:

<quote difftype="svn">
mike@minobo:~/MyDocuments/4projects/debian-edu$ svn diff
Index: debian-edu-config/debian/changelog
===================================================================
--- debian-edu-config/debian/changelog  (Revision 73892)
+++ debian-edu-config/debian/changelog  (Arbeitskopie)
@@ -15,7 +15,6 @@
   * Removal of home dirs: do not chown root:root the whole later-to-be-remove
     home dir tree, only chown root:root for home dir basefolder to block
     access.
-  * Fix debug message in debian-edu-update-netblock.

   [ Petter Reinholdtsen ]
   * Correct the Vcs-Browser link in the control file to use the new paths.
Index: debian-edu-config/sbin/debian-edu-update-netblock
===================================================================
--- debian-edu-config/sbin/debian-edu-update-netblock   (Revision 73892)
+++ debian-edu-config/sbin/debian-edu-update-netblock   (Arbeitskopie)
@@ -104,7 +104,7 @@

 stop_filtering() {
     if [ "$VERBOSE" != no ]; then
-       log_begin_msg "Deactivating network block on this host"
+       log_begin_msg "Activating network block on this host"
     fi
     iptables -P INPUT ACCEPT
     iptables -P OUTPUT ACCEPT
</quote>

Another way I have tried is the one documented here:
http://mybravenewworld.wordpress.com/2007/11/13/subversion-how-to-revert-a-bad-commit/

But the result is similar. The commit to SVN after reverting only includes the debian changelog and the debian-edu-update-netblock script, but not the other scripts with the changed $Id$ header.

What can I do???

Thanks in advance!!!
Mike



--

DAS-NETZWERKTEAM
mike gabriel, dorfstr. 27, 24245 barmissen
fon: +49 (4302) 281418, fax: +49 (4302) 281419

GnuPG Key ID 0xB588399B
mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb

Attachment: pgphzhWutBz00.pgp
Description: Digitale PGP-Unterschrift


Reply to: