auto-merge into sparse checkout branch - new files added

I'm new to SVN and just completed my first merge of the trunk into my feature branch; using auto-merge via MRoR with revision range blank.

It completed successfully and I see what I expected to with the exception that new files that been added to trunk are now showing in the working copy of my branch with a status of "added"

As I considered it, I realize this behavior makes perfect sense.

However, my branch working copy was created via a sparse checkout. I don't want or need the newly added items for my work.

So two questions:
Can I simply delete the items from my working copy?

Is there some option that will prevent newly added items from being added to my sparse checkout unless I specifically cherry pick them?

I'm using TortiseSVN 1.9.4

Thanks!

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-01-23 16:55:40 CET