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

Re: Merge problems

From: John <johndk_at_gmail.com>
Date: Mon, 11 Aug 2008 15:09:56 -0700 (PDT)

I have been experiencing the same problem since installing TortoiseSVN
1.5.2 Build 13595.
Subversion 1.5.0

Has any resolution yet been found?

On Aug 11, 8:23 pm, rwkit <rwhiteho..._at_mratek.com> wrote:
> Merge no longer works after I upgraded to the latest version:
>
> TortoiseSVN 1.5.2, Build 13595 - 32 Bit , 2008/07/31 17:04:57
> Subversion 1.5.1,
> apr 1.2.12
> apr-utils 1.2.12
> berkeley db 4.4.20
> neon 0.28.2
> OpenSSL 0.9.8g 19 Oct 2007
> zlib 1.2.3
>
> What I mean by that is that no matter what I do, merge just says
> "Finished!" and does nothing, even though the branches are clearly
> different.
>
> As our repository doesn't support the new merge stuff, I use the Merge
> Two Branches option to merge a development branch back to the release
> branch. I answer the usual questions in the same ways I always have,
> but it no longer works.
>
> Is there something I'm doing wrong? Is it safe to just reinstall the
> old version, or is there anything I need to watch out for in going
> backward in versions?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: dev-h..._at_tortoisesvn.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-08-12 07:06:39 CEST

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

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