Re: Reintegrate can only be used if revisions XX through YY were previously merged ...

Nico Kadel-Garcia <[email protected]>
Newsgroups gmane.comp.version-control.subversion.user
Message-ID <CAOCN9rx2=qFni6pkn5EqvXQc9Avk92F0aixTNUrAr28Wu0HzKw@mail.gmail.com> 
On Sun, Jan 21, 2024 at 12:06 PM Daniel Sahlberg
<[email protected]> wrote:
>
> Hi,
>
> I'm trying to do a catchup merge between two branches (incidentally within the Subversion website tree) but I fail and I don't have enough understanding to know what is wrong.
>
> I have a working copy from https://svn.apache.org/repos/asf/subversion/site

Merging distinct branches is... one of the things that Subversion is
not best with. I'd suggest using "git-svn" locally to play with, to
see if you can resolve the differences by first merging from the
trunk, then pull in the branches, and *then* push to the upstream
branch.


> Daniel Sahlberg
>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.