I am (still) new to svn and am doing a merge between branches for the first
time. I am using TortioseSVN as a client. I also reviewed the thread from
today "Merge from trunk head". I am doing something similar, but it's not
working out.
I have a project in /repository/trunk that I previously branched to
repository/branches/sub1/trunk at rev. 7 and made cosmetic revisions to, ending
at revision 42. At that time, functional changes to the project that would
apply to both branches needed to be made, and I made those on repository/trunk
ending at rev. 54. I now want to merge the changes there to sub1/trunk so that
the functional changes are incorporated, and (or course) retain the cosmetic
changes already there. It is my intention to merge into a working copy, and
then once I review it commit the sub1/ changes, as the Tortoise manual
suggests.
Using the merge function in Tortoise, I specify From as the URL to
repository/trunk, revision 54. For "to:", I check the "Use From URL" box, and
specify Revision 42. The dialog does show that it is pointing to the correct
working copy path.
When I do a "dry run", all the files that I anticipate need changes are listed
as "updated" except for 3 files listed as "missing". First question: It seems
like (to me) this is a change from "nothing's here" to "something's here" and
the new file should be "updated" as well, but the message suggests otherwise.
What do I need to do to get the new file into the working copy of my branch?
Other than that, the dry run looks good. However when I actually do the merge,
all those listed files are not, in fact, updated, even though the same list of
"updated" files roll by. Second question: Why?
I have messed around with the missing files a bit, moving them into the working
copy file structure, adding them in with tortoise, a few other things, first
before merging with no real change.
What am I missing here?
Thanks.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 5 00:10:08 2006