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

Re: Problem mergin moves from different repos

From: Ben Reser <ben_at_reser.org>
Date: 2004-10-14 18:27:02 CEST

On Thu, Oct 14, 2004 at 10:44:57AM -0400, Ben Collins-Sussman wrote:
>
> On Oct 14, 2004, at 9:59 AM, Guille -bisho- wrote:
>
> >If you merge a changeset that involves moves from a repository into
> >another,
> >an error is raised on commit.
>
> This feature is not supported. It's a bug that 'svn merge' even allows
> you to compare trees from repository A, and merge into a working copy
> of repository B. It should be throwing an error right away by
> comparing repository UUIDs. Sorry. :-(

I'm with kfogel here. It's on my todo list to work on this and
support merging from another repo. Before I had commit access to our
own repo I used my own private repo to work on svn and produce patch.
99% of the time it worked without any problems. The only times there
were issues was when there was an add (move consists of a delete and an
add). The workaround was to in advance find the adds and manually do a
touch filename; svn add before merging them. This worked around the
issue. But we really shouldn't have to do that. If that was fixed
tracking another repo in your own private repo by merging would work
most of the time. There might still be some edge cases. But I don't
see a reason not to support this.

-- 
Ben Reser <ben@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 14 18:27:16 2004

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