Re: auto-merge into sparse checkout branch - new files added

Hi,
Welcome to Subversion.

>> using auto-merge via MRoR with revision range blank.<<
That sounds OK.
>> 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" <<
It sounds like the changes have been merged but not committed. After you merged the trunk into the local working copy of the feature branch, did you then commit the changes back to the Subversion server?
The merge simply updates the local checkout of the working copy with the changes from the trunk. You should check that the merge did what you expect (it probably did), and run any tests that you normally would prior to any other change (perhaps just a test build or, perhaps, a full suite of unit tests). Once you are satisfied that all is well with the local copy, the changes need to be committed to the feature branch. It is then good practice to update the local working copy.

Have a look at http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html. The "Keeping a Branch in Sync" section, describes the process of merge, review status, commit, and finally updating the local checkout.
Hope this helps.
 

    On Monday, 23 January 2017, 15:55, Charles Wilt <charles.wilt_at_gmail.com> wrote:
 

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

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-01-23 17:15:20 CET