Re: problem with merging across unrelated trees

Christian Daudt <csd_ob@daudt.org> writes:

> Hi,
> 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.

I agree, 'svn merge' shouldn't abort when it's unable to perform some
particular patch. It should print a warning and keep going.

This is a known bug... I'm just wondering if it's filed...

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