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

Re: Possible bug in subversion -

From: Greg Thomas <thomasgd_at_omc.bt.co.uk>
Date: 2007-01-19 10:25:35 CET

On Fri, 19 Jan 2007 09:10:14 +0000 (UTC), Duncan Booth
<duncan.booth@suttoncourtenay.org.uk> wrote:

>Read the manual: the file in the working copy had been edited, and a
>revision in the repository had an edit in the same part of the file. In
>that situation subversion cannot automatically merge in the changes so it
>marks them and lets you do it. Use 'svn status' to find which files are
>conflicted and either 'svn resolved' or 'svn revert' as appropriate.

Wasn't there a pre-commit hook hanging around somewhere to stop this
sort of thing being committed to the repository?


This post represents the views of the author and does
not necessarily accurately represent the views of BT.
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 19 10:26:14 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.