Re: Code Reverting Itself

[ sorry about bad post! ]

Nico Kadel-Garcia
Email: nico.kadel_at_tufts.edu
Sent from iPhone

On Sep 26, 2012, at 5:59, Stefan Sperling <stsp_at_elego.de> wrote:
>
> A common problem case is:
>
> - You have a versioned file open in an editor.

Oh, yes, that one is fun. It's also aggravated by deployment processes that edit files in place, rather than Subversion managing a template and deploying a source control excluded file, built at deployment time from local settings.

> - You run 'svn update' and the file receives changes from the repository.
> - The editor doesn't notice the file has been changed on disk, so the
> changes brought in by the update are not reflected in the editor window.
> - You save from the editor, overwriting changes brought in during the update.
> - You commit the current state without checking that what you're
> committing is really what you intend to commit, undoing already
> committed changes.
>
> I suspect you're running into some variant of this problem.
> The usual workaround is to get a smarter editor, or close the editor
> before running 'svn update'.

There are good hooks in Emacs, for example, with psvn.el installed. But that now required Emacs-23 or later.

There is also a commonly used procedure of doing "svn checkout" on top of an existing working copy without clearing away old local changes with "svn revert". I ran into that one, with the "Tuttle" configuration management system. The results led to various merging adventures for people who didn't realize old test config settings were not cleared nightly, and wound up committing them back upstream.

> for changes that are unrelated to what was supposed to be committed.
> Maybe that will help you with pinpointing the cause of the problem.
Received on 2012-09-27 14:44:42 CEST