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

Re: merge question

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-08-10 14:59:16 CEST

On Aug 10, 2005, at 3:51 AM, Holger Biebinger wrote:
> In my trunk working copy I tried
> svn merge -r100:110 [PATH_TO_REP]/branches/A
> to apply branch changes to the trunk. For the moved files I always get
> the "skipped missing target" message.

You shouldn't get any 'skipped' messages at all; those messages mean
you've specified an incorrect patch to apply to the working copy.
Something must be wrong about your description. Your description
looks correct, but if you're seeing 'skipped' messages, then the real
situation must be more complex, or you must be over-simplifying. If
you want more help then you'll need to show us an actual transcript
which demonstrates the whole problem.

> After the merge changes applied to
> foo in trunk are lost.

This is a separate issue, and is expected.

The edited files are not lost, they just become unversioned. The
problem arises when you edit file 'foo', and then 'svn up' or 'svn
merge' wants to move foo. We don't yet have a true move operation --
just copy and delete. So the 'update' or 'merge' command adds the
new-name of foo, and deletes the edited foo, rather than actually
moving your edited foo to the new-name. Because foo has local edits,
however, the deletion doesn't really delete the file. Instead, your
edited 'foo' becomes unversioned.

Here's the issue explaining the problem:


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 10 15:01:18 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.