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

Merge from branch doesn't record added files correctly

From: Steve Sherwood <steve_at_sherwood-tech.co.uk>
Date: Thu, 21 Jan 2016 03:06:57 -0800 (PST)

I am having an issue with tortoise SVN when merging that I am hoping there is a workaround for.

We typically work by committing all changes to trunk. When finished we check out RC branch and merge to the checked out folder all revisions with changes in. We then use code collaborator to peer review the changes before committing the modifications in the RC branch back to SVN.

When we add new files in trunk to a new folder and then merge to the checked out rc branch the tortoise UI shows Normal(+) next to all new files inside the new folder.

The problem here is that these files are not seen by the command line tool (supplied in the same version of tortoise) as changes and hence code collaborator will not pick them up for peer review.

Is there a way to to make a merge record added files show up as added(+) rather than normal(+)? If not can I request this as a merge option?

Steve

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3156409

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-01-21 12:09:59 CET

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