RE: merge --reintegrate after a mv in the branch (SVN 1.5.0 / Windows)
From: Baeriswyl Kuno - Extern (IT-BA-MV) <kuno.baeriswyl_at_sbb.ch>
Date: Fri, 27 Jun 2008 15:39:58 +0200
Hello Thomas,
I've got the same issue. After 1 day playing with stable 1.5 build, I've got the impression that the repository turns quickly in a stange state after moving a file. Even in the situation were you do a file move prior to a branch, the reintegration is not possible anymore. And for future branches too.
It seems that the merge tracking feature hasn't been fully implementend (See Release notes). However, I'd liked to know with scenarios are actually supported. I tried to gather information from different sources. In my point of view, feature branches and bidirectional merging are not well supported.
Let me know, when you get it working.
Thanks a lot for sharing your expirience
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.