Re: merging suddenly doesn't work

On 11.05.06 14:09:38, Garrett Rooney wrote:
> On 5/11/06, Andreas Pakulat <apaku@gmx.de> wrote:
> >Hi,
> >
> >I have slight problem merging the changes between 2 revisions in from
> >"another" repository into the working copy of my repository. This used
> >to work without problems before I merged the svn:ignore propery changes
> >from "the other" repository.
>
> Merging between two different repositories has never been supported.
> If it ever worked it was purely accidental.

Hmm, I think it worked here because basically the repositories contain
pretty much the same code, I added some files in my version and I also
changed some from upstream, but most of them are "original".

So do you have a hint on how I could merge using the python script
mentioned in my original post? I mean such that the merged project ends
up in <myrepository>/project/trunk and not in
<myrepository>/project/foo?

Or am I better off using diff and patch?

Andreas

-- 
In the stairway of life, you'd best take the elevator.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org