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

Re: question on merging revisions/svn patch

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 22 Apr 2019 20:43:28 +0200

On Mon, Apr 22, 2019 at 01:29:15PM -0400, Kathleen Warren wrote:
> Hi all,
>
> I've gotten myself into a bit of a svn merging funk and I'd like to know if
> my proposed solution will cause further errors.
>
> Due to a misunderstanding of how svn handles mergeinfo, I merged several
> commits from branch A into trunk like so: svn merge -c 1,2,3 ^/branches/A,
> with the idea of merging all three of those commits into branch B and only
> one into branch C.
> I realized when attempting to merge from trunk to branches B, C that I
> couldn't merge from trunk to get the content of those merges unless I
> specified the merge commit (let's call it revision 4) rather than any one
> or all of merges 1,2,3 as before.
> So I merged the merge commit into branch B, so now branch B has the content
> changes I want.
> But what about branch C? I only want one of those commits. My idea was to
> record a mergeinfo change and manually apply the patch and commit THAT -
> will that cause bad merge conflicts down the line?
> Thanks,
> Kathleen

Hi Kathleen,

Have you considered merging the change in question directly from branch A
to branch C, instead of merging the merged change from trunk to branch C?
Merging into C like this should work: svn merge -c 2 ^/branches/A

Whether or not you'll see conflicts down the line is hard to say
without knowing more about the nature of these changes.

Regards,
Stefan
Received on 2019-04-22 20:43:52 CEST

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