RE: Merging change sets with missing files and directories

Hi Fu,

You would have to find the revision where "a" was added (ie r42) and the
revision where foo.txt was last modified (ie r73)
svn merge r42:73 should do the trick. All subdirectories added since r42
will be included.

Note : This will also merge any other files modified in that revision
range.

Thanks
Lakshman
-----Original Message-----
From: Leow, Fu [mailto:fu.leow_at_etrade.com]
Sent: Thursday, 3 January 2008 11:59 AM
To: users_at_subversion.tigris.org
Subject: Merging change sets with missing files and directories

I'm trying to merge a change set that contains modifications to a file
but the file and the directories do not currently exist in the working
copy. For example, the change set has modifications to the file
"foo.txt" in the directory a/b/c/d/foo.txt. However, the file "foo.txt"
and the directories (a/b/c/d) do not exist on the working copy. The
merge won't work and it will return a "Skipped Missing File" message.
What is a good way of handling this?

Assuming that the directories were not added in the same change sets
then how can I handle a recursive add? (i.e. the "a" directory was added
in r42, "b" in r50, "c" in r60 etc)

One solution would be to find when each of the directory was added and
merge that revision, but I wondering if anyone has better ideas?

Thanks!

Fu Leow

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org

================================================================================================
EMAIL DISCLAIMER

This email and any attachments are confidential. They may also be subject to copyright.

If you are not an intended recipient of this email please immediately contact us by replying
to this email and then delete this email.

You must not read, use, copy, retain, forward or disclose this email or any attachment.

We do not accept any liability arising from or in connection with unauthorised use or disclosure
of the information contained in this email or any attachment.

We make reasonable efforts to protect against computer viruses but we do not accept liability
for any liability, loss or damage caused by any computer virus contained in this email.
================================================================================================

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-04 04:56:57 CET