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

Re: All revisions show up as already merged

From: Stefan Hett <stefan_at_egosoft.com>
Date: Tue, 24 Jan 2017 12:02:43 +0100

Hi,
On 1/23/2017 5:42 PM, Álvaro G. Vicario wrote:
> I'm hitting a 100% reproducible issue in the following context:
>
> 1. I commit several revisions to trunk.
>
> 2. Customer approves an early version of my codebase to be deployed.
>
> 3. I create a branch from that earlier release.
>
> Now, when I want to merge changes from trunk into branch, TortoiseSVN "Select revision range" dialog considers all of them as already ported. I need to uncheck "Stop on copy/rename" in order to see them, they are grayed out and clicking "Hide non-mergeable revisions" makes them go away.
>
> I'm not sure if I'm overlooking something about TortoiseSVN, I'm doing something plain wrong at Subversion level or I've hit a bug.
I faintly recall there was a bugfix done regarding this (or a similar?)
scenario where the peg-revision was determined incorrectly if a branch
was created not from HEAD. You can search the mailing list. I think
there was some discussion here or test TSVN 1.9.5 or the nightly to
double check whether that fixes the issue. If not, I'll try to dig out
the old thread for you to double check whether this applied to your case.

-- 
Regards,
Stefan Hett
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3204400
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-01-24 12:03:00 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.