Re: question on merging revisions/svn patch

2019-04-22 Thread Stefan Sperling
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

question on merging revisions/svn patch

2019-04-22 Thread Kathleen Warren
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