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

RE: Tortoise SVN merge bug?

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Mon, 1 Feb 2010 18:07:42 -0500

> > When I select merge I get three options. The first option "Merge a range
> > of revisions" produces varied results. If you want to merge an entire
> > branch back to the trunk (from where it was branched), it actuall does a
> > revert when you follow the instructions "To merge all revisions, leave
> the
> No it doesn't. Unless the path you are merging to is not the path that you
> coppied the branch from.
> Are you selecting Merge from the WC of the trunk?

Also, if you are merging trunk TO branch... then want to merge branch back to trunk make sure you selected "Reintegrate" check box.


> > box empty." If you enter the revision range then it does work. I
> suspect
> > if you leave it blank and check "Reverse merge" it would work also.
> > Jeff
Received on 2010-02-02 00:07:45 CET

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

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