Historic merge "done wrong" doesn't work in up to date working copy
From: Kris Deugau <kdeugau_at_vianet.ca>
Date: Mon, 23 Jan 2017 11:29:03 -0500
I've been maintaining a set of spam filter rule files in Subversion for
I've just recently done a major refresh on my PC, switching to the
The directory structure I've suddenly found I've been merging
(Note a small number of files were added in dev/, but have not been
dev/ and prod/ were created at the same time, in r1. Files were created
With the old 1.6 client, I was able to "svn merge ^/dev" in prod/, and
With 1.8, it's now complaining that dev/ and prod/ have no common ancestor.
What can I do to get unstuck?
This is an archived mail posted to the Subversion Users mailing list.