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

Re: Tortoise not adding new files during merge.

From: darrinps <darrinps_at_gmail.com>
Date: Wed, 27 Jul 2011 07:13:17 -0700 (PDT)

Had the wrong option set is all. Needed to select the first one.

darrinps wrote:
> I have a case where I have a branch off of trunk (call it
> my_trunk_test_branch) and another branch off of trunk, (call it
> change_branch) that I have my personal working branch off of (call it
> my_change_branch).
> I am trying to merge my personal branch directly into the
> my_trunk_test_branch to see if all looks good, and if it does, then I will
> do another merge going directly into trunk.
> When I try to merge my_change_branch to my_trunk_test_branch, everything
> goes great in that the files in my_trunk_test_branch are updated with the
> changes from my_change_branch BUT none of the new files that got added to
> change_branch (which my_change_branch is cut from) are NOT being added!
> SOME of the new files I added to my_change_branch appear to be added back
> into my_trunk_test_branch though.
> What could it be that I am doing wrong for this to happen?
> I've tried to redo it several times and get the same results.
> Thanks!

View this message in context: http://old.nabble.com/Tortoise-not-adding-new-files-during-merge.-tp32131943p32148316.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-07-27 16:17:31 CEST

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

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