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

RE: Crach when trying to reintegrate branch

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 25 Oct 2012 12:27:30 -0400

> On 25 October 2012 16:29, Bob Archer <Bob.Archer_at_amsi.com> wrote:
> > You should attempt to merge rather than test merge. The error may not
> occur in that case. You won't mess anything up because the merge only
> happens in your working copy. If there is a problem with it you can always do a
> revert rather than a commit. (Assuming you have no uncommitted changes in
> your target working copy prior to the merge... which is highly recommended).
>
> Bob, please read the replies in the same thread. This has already been verified
> as a bug in core subversion, fixed and nominated for backport to 1.7.x
>
> Simon

Erm... I did read the thread. There have been occasions where errors occurred in "test" merge that didn't occur in live merge... hence my suggestion.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3023502

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-10-25 18:28:03 CEST

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