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

Re: Merge - new files

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-03-14 03:53:41 CET

Kevin Aubuchon <Kevin.Aubuchon@reuters.com> wrote on 03/13/2006 08:54:14
PM:

> When I create new source files on a branch, I can't get them to the
> trunk. I add the file to the repository and commit them. Then I when
> I merge the branch into the trunk, I always get the msg "Skipped
> Missing Target" and the new files aren't added to the trunk. What
> else should I be doing?
> C# project files and source files. The client is the command line
> tool and TortoiseSVN.

You should probably boil it down to a simple recipe to demonstrate. That
being said, I think the issue would be whether the merge command you run
includes the revision when the files were added. In other words, as long
as the merge includes the add, it will add the file to the WC. If your
merge range only included revs where you changed the new files, then it
would try to apply that change to the WC, not find the file, and issue
that message.

A transcript would let us see the revision where you committed the add, as
well as the merge command you specified.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Tue Mar 14 03:54:33 2006

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