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

Question on merging only part of a revision

From: Norton, Richard <Richard.Norton_at_lfg.com>
Date: 2007-07-09 23:26:10 CEST

Here's the situation:

In my repository trunk, revision 8 added directory 'database/APPS/packages', and a number of files in that directory as a single commit.
Later, revision 81 added another set of files to that directory.

Now, we've create a release branch from revision 4 and merged a small assortment of revisions from the trunk to the branch. This assortment of revisions did NOT include revision 8, which created the above referenced directory.
Now, we want to merge revision 81, to get the files that were added there, but we do NOT want all the files that were added in revision 8.

Can anyone tell me how to create/add/copy JUST the directory from revision 8, with none of it's content, such that it doesn't create a later conflict when I have to merge the rest of revision 8 into the release branch?

Richard Norton
Lincoln Financial Group
Employer Markets - Midrange Systems
8801 Indian Hills Dr.
Omaha, NE 68114

Phone: 402-361-7509
Fax: 402-501-9723
Email: richard.norton@lfg.com
Notice of Confidentiality: **This E-mail and any of its attachments may contain
Lincoln National Corporation proprietary information, which is privileged, confidential,
or subject to copyright belonging to the Lincoln National Corporation family of
companies. This E-mail is intended solely for the use of the individual or entity to
which it is addressed. If you are not the intended recipient of this E-mail, you are
hereby notified that any dissemination, distribution, copying, or action taken in
relation to the contents of and attachments to this E-mail is strictly prohibited
and may be unlawful. If you have received this E-mail in error, please notify the
sender immediately and permanently delete the original and any copy of this E-mail
and any printout. Thank You.**

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 9 23:26:30 2007

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.