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

Re: merging and deleted directories

From: Greg Landrum <greg.landrum_at_gmail.com>
Date: 2006-05-02 20:53:59 CEST

On 5/2/06, Andrew Goodnough <Andrew.Goodnough@wicourts.gov> wrote:
> >>> On Mon, May 1, 2006 at 7:11 pm, in message
> <60825b0f0605011711m195cebei9c373226681af8cc@mail.gmail.com>, "Greg
> Landrum"
> <greg.landrum@gmail.com> wrote:
> > /d/glandrum/svn_test/branch >svn merge - r 4:7
> svn://marten/Test/trunk
> > svn: Working copy 'dirA' is missing or not locked
> Are you saying the previous statement failed and didn't perform a
> merge?

correct, this generates the error message above, but no merge takes place.

> > /d/glandrum/svn_test/branch >svn merge - r 4:6
> svn://marten/Test/trunk
> > Skipped missing target: 'dirA\file1.txt'
> > Skipped missing target: 'dirA'
> >
> And that this one printed warnings but succeeded otherwise?

again, correct.

> Could you comment the areas around the problem with what you expect to
> happen? It might help someone bridge the gap between that and what is
> actually happening.

I would expect the merge to take place in the directories that still
exist on the branch. This is what happens as long as I haven't added
any new directories to the deleted dirs on the trunk (e.g. when I can
merge to revision 6). The problems start at revision 7 (after I've
added a directory to dirA on the trunk).

This seems to be related to Issue 2515:
which was reported back at the beginning of March.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 2 20:55:11 2006

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.