subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bob Archer <Bob.Arc...@amsi.com>
Subject RE: Tortoise SVN merge bug?
Date Mon, 01 Feb 2010 23:07:42 GMT
> > 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.

BOb



> 
> 
> > 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

Mime
View raw message