[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: Damien Tougas <dtougas_at_bates.edu>
Date: 2006-11-03 15:58:25 CET

On Thu, Nov 02, 2006 at 10:26:02PM +0100, Erik Huelsmann set forth:

>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.

I upgraded my client to 1.4 today, and that fixed the problem. Thanks
for the info, I really appreciate it!

Damien Tougas
Web Programmer/Analyst
Bates College

  • application/x-pkcs7-signature attachment: smime.p7s
Received on Fri Nov 3 16:11:22 2006

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