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

Merging Files From Branch That Were Deleted In Trunk

From: jrduncans <stephen.duncan_at_gmail.com>
Date: Fri, 22 Aug 2008 11:26:57 -0700 (PDT)

I realized (too late unfortunately) that this would be a problem for merging,
but here's the scenario:

Using SVN 1.4.x with svnmerge.
Developed code related to a new feature in trunk in some unknown commits.
Decided that this feature needed to be in a branch so that trunk could be
used for next release (lesson learned to plan ahead).
Created the branch at r2310
Deleted the code for that feature from trunk at r2318
Blocked that deletion-change from trunk to the branch, but merged everything
else so the branch is up to date.
Now I want to merge back to trunk.
Problem: all the files that are in the directories that were deleted in
r2318 won't come over ("Skipped missing target").

Except for one change (a version number in a file that was distinguishing
the branch from the trunk), I want to trunk to look the branch after the
merge. How do I get there from here?

View this message in context: http://www.nabble.com/Merging-Files-From-Branch-That-Were-Deleted-In-Trunk-tp19113101p19113101.html
Sent from the Subversion Users mailing list archive at Nabble.com.
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-22 20:27:17 CEST

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

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