I'm not sure if this is the same issue that has already been discussed, but here it is...
I've run into an svnmerge-integrated property conflict in a very simple way. Assume the repository has a trunk and two branches A and B, with two separate users trying to do merge into the trunk in two separate working copies in the same time frame. 1. User1 performs a svnmerge.py merge from A to the trunk, but does not commit anything. 2. User2 performs a snvmerge.py merge from B to the trunk, but does not commit anything. 3. User1 updates and commits the merge without any problem. 4. User2 updates and tries to commit the merge and gets a svnmerge-integrated property conflict. 5. User2 manually sets the svnmerge-integrated property using svn propset to resolve the conflict (Not very nice). 6. User2 commits the merge without any more problems. Obviously if steps 2 and 3 are reversed there is no conflict. Our development environment has many project branches developing in parallel which periodically merge back to the trunk, so this issue came up within the first week of using svnmerge.py. Am I'm missing something that already exists to solve this problem? If not, a possible solution could be a new svnmerge.py "update" command that would update the svnmerge-integrated and svnmerge-blocked properties and automatically merge/resolve property conflicts when possible, any opinions on this? If this new "update" command is added it should also "fix & resolve" a property that is currently in conflict from a previous svn update command (ie Step 4) Regards, Gunter
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
