Re: Effects of merge on added files

Eric Sammer <eric@ineoconcepts.com> writes:

> If I try the following to merge the branch back into trunk:
>
> cd ProjectName/trunk
> svn merge ../dev_0_01@HEAD ./@HEAD
>
> I get errors such as:
>
> Skipped missing target: A_file_added_in_branch.c

Well, Eric, I am not a Subversion "noob", but I too would complain
about such behavior. Like you, I've always thought of merge as "diff
applied to files instead of to stdout".

Now, I can understand doing this if we receive as part of the merge
modifications to a file that doesn't exist, but why would we ignore
the addition of a file that doesn't exist?

[ C-Mike goes to see what we really do. ]

Hm. I'm not seeing what you're seeing.

If I copy a directory, commit, add a file to that copy, commit, and
then merge from the copied dir to the original, I get a new file
marked for addition.

Ah, ah. I see.

I did:

   $ svn merge -r N-1:N ../branch .

where N was the revision in which I added the new file. But when I
did:

   $ svn merge ../branch@HEAD ./@HEAD

I got the "skip" notification.

I think I know what's happened here. You're commandline is not quite
right. What you are asking for is the diff between the tip of your
branch and the tip of your trunk, which actually would be the
*removal* of anything added to the branch.

You want:

   svn merge ./@HEAD ../dev_0_01@HEAD

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Oct 11 07:00:28 2003