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

RE: Re: Mergetracking missing after update to TortoiseSVN 1.8.4, Build 24972

From: Franz Gsell <vl950t_at_freenet.de>
Date: Tue, 25 Mar 2014 08:52:41 -0700 (PDT)

Hi,

we can reproduce that issue as well. I think this is a major one because if you can't rely on the merge info you are somehow lost.

Thanks,
Franz

> We've had this same issue. I think it's a bug. Here's the basic way to reproduce:
>
> User #1 merges from A -> B and commits.
> User #2 merges something else from A->B but doesn't update first to get User #1's changes.
> User #2 commits, and SVN allows the commit. After reviewing the resulting mergeinfo, User #1's mergeinfo is overwritten, and the merge log is lost.
>
> I'm a new user, and haven't found how to submit a bug report, but I've reproduced this several times with TortoiseSVN 1.8.5. Note, we're using 2.5.16 version of VisualSVN server.
>
> My opinion is SVN should reject User #2's commit, and inform them they have an out-of-date working copy and it should force them to update before committing their merge changes.
>
> Thanks,
> Jeb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-03-25 16:53:52 CET

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

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