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

Re: problem with merging across unrelated trees

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2003-03-10 20:24:30 CET

Christian Daudt <csd_ob@daudt.org> writes:
> I just ran into the following problem: I have a branch A in which I made a
> modification to a file X, and now I'm trying to merge that delta into a
> separate branch B which doesn't come from a common ancestor of A (i.e. I
> imported both A and B distinctly). File X has never existed in B. Once I try
> the merge, it aborts at that file X saying that it is not under revision
> control. While I know that there is nothing that it can do for my file, it
> shouldn't abort the merge halfway through because of that IMHO.

Yes, I think it would be better if it didn't stop the merge. Unless
someone can think of a reason why this is desirable, it sounds like
you've found a bug.

Can you file an issue? Just the above paragraph is enough
description, though if you want to whip up a reproduction script, it
would probably be very easy to do... :-)

Thanks,
-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 10 21:01:38 2003

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

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