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

Re: Merge problem/question

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-10-05 01:34:22 CEST

Daniel Rall <dlr@collab.net> wrote on 10/04/2006 06:33:08 PM:

> On Wed, 04 Oct 2006, Mark Phippard wrote:
> ...
> > Interestingly, he told me that in r9942 the user created a branch from
his
> > WC. So it created the branch, and also included his modifications. So

> > they need to include this revision in the merge. I didn't think the
> > command line could handle that scenario.
> ...
>
> Yes, you can do a WC -> URL 'copy', which includes any local changes
> in your WC as part of the destination URL.

That part I knew, Subclipse lets you do that. I was referring to merge. I
thought that merge could not handle getting the revision that created the
branch. I thought that always gave the "Cannot create folder from within"
error.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 5 01:34:40 2006

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