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

RE: Re: Docs for reintegration unclear

From: Marshall <mamills.gseit_at_gmail.com>
Date: Thu, 5 Sep 2013 10:25:02 -0700 (PDT)

Hey Bob,

>Generally, you will use Reintegrate. This is usually for the feature branch use case.
>In 1.8.x you don't have to make the choice, svn will figure it out for you.

I ran "merge reintegrate..." on my trunk working copy and it failed. It tried to merge some very old branch, one in fact that another developer had used.

Command Getting required information...
Command Merging https://<redacted>/svn/<projectName>/private/<differentDeveloper>/reports into O:\<projectName>, respecting ancestry
Error '/svn/<projectName>/!svn/rvr/667/private/<differentDeveloper>/reports' path not
Error found

Yesterday when I mentioned I synchronized my branch with the trunk, the branch that got synchronized was something like https://<redacted>/svn/<projectName>/private/Marshall/bugfix12345


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-05 19:25:05 CEST

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.