I created a branch from another branch, and after I am ready to merge, I encounter this problem:
$ cd photon-branch; svn update
$ svn merge –reintegrate https://nanoes.svn.sourceforge.net/svnroot/nanoes/branches/photon-recursive/
svn: Cannot reintegrate from ‘https://nanoes.svn.sourceforge.net/svnroot/nanoes/branches/photon-recursive’ yet:
Some revisions have been merged under it that have not been merged into the reintegration target; merge them first, then retry.
It turns out to be [...]
Filed under: Uncategorized | Tagged: linux, programming, subversion | Leave a Comment »
