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

Re: Possible bug : impossible to merge on a Subversion 1.4 server with TortoiseSVN 1.5

From: Wim Coenen <wcoenen_at_gmail.com>
Date: Fri, 4 Jul 2008 17:12:26 +0200

2008/7/4 Fabio Maulo <fabiomaulo_at_gmail.com>:

> At this point I think it is the same problem of
>
> http://groups.google.com.ar/group/tortoisesvn/browse_thread/thread/fa9bcd99b8f548b9/5d83bbcbcc89ed5a#5d83bbcbcc89ed5a
>
> and it is a probably bug or better more a know Breaking Change.
>
>
The issue you are having is with commits failing. Bouiaw's issue is that a
merge is failing.

Bouiaw: This is normal if you are using "reintegrate branch" on a 1.4
subversion server, because merge tracking was only introduced in 1.5. Try
using "merge a range of revisions" instead of "reintegrate branch". It
requires you to manually specify which revisions to merge, but it will work
with the subversion 1.4 server.

HTH,

wcoenen
Received on 2008-07-04 17:12:40 CEST

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