On Oct 30, 2007, at 13:01, Fouts Christopher (QNA RTP PT PREV) wrote:
> - I created a branch, branchA, from trunk
> - trunk tagged trunk with trunk2branchA, and branchA tagged
> with branchA2trunk
> - Many new files added, which are of course not tagged with
> trunk2branchA
> - Merging from trunk to branchA does not nerge new files
> of course
> - Merging from branchA to trunk now deletes the new files
> on trunk
>
> How can I resolve this so I can merge new untagged files
> from trunk onto my branch?
You haven't shown us any of the merge commands you're trying to
execute, or what happens as a result, but this should be possible to
do. I don't use tags while merging, so this may be different than
you're expecting, but if, for example, you created branchA from trunk
at r100, and you have made changes on the branch (including adding
new files) and it is now r200 and you would like to merge these
changes to the trunk, then go into a clean trunk working copy and
merge in the changes from branchA like this:
svn merge -r100:200 url://to/your/repo/branchA .
Then check the status of your working copy, make sure all your new
files and other changes are there (they should be), test the working
copy, and commit when ready, noting in your commit message that you
merged r100:200 of branchA into the trunk.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 30 21:34:02 2007