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

Merge skipping newly added files

From: Robert Swarbrick <robert.swarbrick_at_asg.com>
Date: 2005-03-03 13:52:03 CET

Hi all,

We've a couple of branches in the system I work on, and in trying to
merge from one branch to trunk I keep getting "Skipped missing target".

This isn't close to my first merge, and I know I've had new files
created in previous merges correctly - so I'm looking for ideas on what
to investigate (but a "do this and you're sorted" won't be ignored!)

The problem
~~~~~~~~~~~
In the "sen_local" branch, a new directory "error" was added (see output
below), and then a set of files under that. I didn't add these, but it
all looks fine in the repository.

Merging from that branch back to the trunk (called sen_65 in my working
copy) doesn't add the new directory as I'd expected it to, it just skips
it. I can't see any reason for this in the 1.1 SVN book.

I'm using SVN 1.1.3, TortoiseSVN 1.1.3 build 2502 as a client, against a
1.1.1 SVN server running on Linux Red Hat 9. It's on a private LAN and
is simply accessed using the svn:// protocol (no http).

There's been multiple merges between this branch and trunk before, all
by me, and all fine.

Any ideas what I should look at to resolve this?

Sample output from TortoiseSVN's Merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Updated: D:\Dev\sen_65\sen_mgr\src
Added: D:\Dev\sen_65\sen_mgr\html\error
Skipped missing target: D:\Dev\sen_65\sen_mgr\html\error\key-error.html

Skipped missing target: D:\Dev\sen_65\sen_mgr\html\error\expired.html
Skipped missing target: D:\Dev\sen_65\sen_mgr\html\error\disk-error.html

Skipped missing target:
D:\Dev\sen_65\sen_mgr\html\error\clock-error.html
Skipped missing target: D:\Dev\sen_65\sen_mgr\html\error\path-error.html

Skipped missing target: D:\Dev\sen_65\sen_mgr\html\error\timeout.html
Skipped missing target: D:\Dev\sen_65\sen_mgr\html\error\HEADER.html
Skipped missing target:
D:\Dev\sen_65\sen_mgr\html\error\key-mismatch.html
Updated: D:\Dev\sen_65\sen_mgr\html\error
Updated: D:\Dev\sen_65\sen_mgr\html
Updated: D:\Dev\sen_65\sen_mgr\install\conf\menuset.db

Regards,
Robert Swarbrick.
 

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 3 13:54:40 2005

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