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

question on merging revisions/svn patch

From: Kathleen Warren <warrenkathleene_at_gmail.com>
Date: Mon, 22 Apr 2019 13:29:15 -0400

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?
Received on 2019-04-22 20:24:20 CEST

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