Hi Richard,
Step 1. Checkout a new copy of your project.
Step 2. Merge revision 8 into your project
Step 3. Revert all but the directory creation and commit, alternatively
commit _only_ the directory creation
Step 4. merge revision 81 into your project
My suggestion will be to merge revision 8 and keep all changes :), after
all its all new files anyway.
Thanks
Lakshman
-----Original Message-----
From: Norton, Richard [mailto:Richard.Norton@lfg.com]
Sent: Tuesday, 10 July 2007 7:26 AM
To: users@subversion.tigris.org
Subject: Question on merging only part of a revision
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
=======================================================
The information contained in this email and any files attached may
be confidential information to the intended recipient and may be
the subject of legal professional privilege or public interest immunity.
If you are not the intended recipient, any use, disclosure or copying is
unauthorised.
If you have received this document in error please telephone 1300 307 082
*******************************************************************
This footnote also confirms that this email message has been swept
for the presence of computer viruses.
*******************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 10 02:27:18 2007