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

Re: Merge problem

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2006-11-02 22:26:02 CET

On 11/2/06, Damien Tougas <dtougas@bates.edu> wrote:
> On Thu, Nov 02, 2006 at 10:08:25PM +0100, Erik Huelsmann set forth:
>
> >You don't say which version svn you're using. That's usually (and in
> >this case even more) relevant information. In 1.4 a (large) number of
> >wc related issues have been fixed a number of them merge-replaces-file
> >related.
>
> Interesting... I am running 1.3.2 on the client and 1.2.3 on the
> server. Perhaps I should look at upgrading.

The issues (fixes) I'm talking about are client-side and will
interoperate with any 1.0+ server version. The collective fixes were
called wc-replacements and are related to files (with history) ending
up in a Replace state, which would break the working copy, either
through 'merge' or copy/move.

HTH,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 2 22:27:52 2006

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