[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

AW: Perplexing results of SVN commit

From: Markus Schaber <m.schaber_at_3s-software.com>
Date: Tue, 12 Jul 2011 14:18:38 +0200

Hi, Ryan,

Von: Ryan Schmidt [mailto:subversion-2011a_at_ryandesign.com]
>
> Sounds to me like operator error of the following kind: the developer
> modified the files in the working copy, and also made identical
> modifications to the corresponding pristine files in .svn/text-base
> (frequently this happens when using a batch search-replace tool).
Because
> even after the edits the contents of the pristine files match the
regular
> files, "svn st" and "svn di" don't show the changes and they don't get
> committed.
>
> If this is what happened, check out a fresh working copy, manually
copy
> over the changed files, and commit them. And ensure that in the future
you
> do not edit anything in the .svn directories. Some batch
search-replace
> tools let you define directories they're not to touch.

This kind of problem seems to be rather common. What about an additional
option to "svn cleanup" to check the validity of the base files, and
restore them from the repository?

Best regards

Markus Schaber

___________________________
We software Automation.

3S-Smart Software Solutions GmbH
Markus Schaber | Developer
Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 |
Fax +49-831-54031-50

Email: m.schaber@3s-software.com | Web: http://www.3s-software.com
CoDeSys internet forum: http://forum.3s-software.com
Download CoDeSys sample projects:
http://www.3s-software.com/index.shtml?sample_projects

Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner |
Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915
Received on 2011-07-12 14:19:18 CEST

This is an archived mail posted to the Subversion Users mailing list.