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

RE: Missing ranges. Cannot merge back to trunk from branch

From: Paul Lester <paul.lester_at_aig.com>
Date: Thu, 29 Jan 2015 11:40:02 -0800 (PST)

I figured it out. Once I got to the correct trunk, I needed to do a record-only merge of that specific revision from my branch, 28242. After I checked that into the trunk, I was able to do a merge from the trunk to the branch.

Even though the previous merge from branch to trunk was listed in the log, for whatever reason, it wasn't marked in the trunk.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-29 20:47:50 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.