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

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



Den 23. aug. 2011 12:11, skrev Mike Gabriel:
Hi Petter,

On Di 23 Aug 2011 11:27:14 CEST Petter Reinholdtsen wrote:

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

I would just do

  svn diff -r73891:73892 |patch -p0 -R
  svn commit -m "Revert commit 73892."

and ignore the $Id$ changes.

Could you check the output of svn diff -r 73891 ? The revision 73891 was the one before I committed the intended comment line fix. I cannot really see what the diff actually is as it seems as if the lines removed will be added again.


Using "svn log -v|less", I probably find the interesting part:

------------------------------------------------------------------------
r73894 | mike-gabriel-guest | 2011-08-23 12:08:00 +0200 (ti., 23 aug. 2011) | 2 lines
Endrede filstier:
   M /trunk/src/debian-edu-config/etc/debian-edu/hd-warn.conf
   M /trunk/src/debian-edu-config/lib/mime/packages/debian-edu-mailcap

part of last revert, fixes $Id$ lines.

------------------------------------------------------------------------
r73893 | mike-gabriel-guest | 2011-08-23 11:09:23 +0200 (ti., 23 aug. 2011) | 1 line
Endrede filstier:
   M /trunk/src/debian-edu-config/debian/changelog
   M /trunk/src/debian-edu-config/sbin/debian-edu-update-netblock

Reverting previous commit and going back to revision r73891.
------------------------------------------------------------------------
r73892 | mike-gabriel-guest | 2011-08-22 08:22:45 +0200 (ma., 22 aug. 2011) | 1 line
Endrede filstier:
   M /trunk/src/debian-edu-config/README.ldap
   M /trunk/src/debian-edu-config/debian/changelog
   M /trunk/src/debian-edu-config/etc/debian-edu/hd-warn.conf
   M /trunk/src/debian-edu-config/etc/ifplugd/ifplugd.action
   M /trunk/src/debian-edu-config/etc/samba/netlogon/login.bat
   M /trunk/src/debian-edu-config/lib/mime/packages/debian-edu-mailcap
   M /trunk/src/debian-edu-config/sbin/debian-edu-update-netblock

Fix debug message in debian-edu-update-netblock.
------------------------------------------------------------------------
r73891 | mike-gabriel-guest | 2011-08-19 20:39:24 +0200 (fr., 19 aug. 2011) | 3 lines
Endrede filstier:
   M /trunk/src/debian-edu-config/debian/changelog
   M /trunk/src/debian-edu-config/share/debian-edu-config/tools/gosa-remove

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.
------------------------------------------------------------------------
r73890 | andi-guest | 2011-08-19 17:28:30 +0200 (fr., 19 aug. 2011) | 2 lines
Endrede filstier:
   M /trunk/src/debian-edu-config/debian/changelog
   M /trunk/src/debian-edu-config/etc/bind/db.intern
   M /trunk/src/debian-edu-config/ldap-bootstrap/gosa-server.ldif

Use UDP SVR record instead of TCP for Kerberos.  By default, the KDC
does not listen on any TCP ports.
------------------------------------------------------------------------

--
Marius



Reply to: