Grzegorz Kossakowski pisze:
Hello,
I know that it is not tightly Cocoon-related question but I hope to get
help from your.
I think I'm ready to merge changes made in whiteboard/objectmodel
branch. I've started doing so but I realized that files history (from
branch) is lost during merge operation. My question is, how to perform
merge of branch in the way that history of files is also ported?
I've already searched the internet but no found solution seems to
working for me, unfortunately.
Nevermind, it turns out that its a limitation of Subversion, quoting
http://git.or.cz/gitwiki/GitSvnComparsion:
All changes made on the branch appear to be made by the merging user.
* This means that from a historical perspective every line of code modified on the branch will appear in the trunk as though it was
written by the user who merged the branch. This is wrong if there were other users working on that branch.
In my opinion that is very serious limitation, luckily enough, it will get
addressed in Subversion 1.5:
http://subversion.tigris.org/roadmap.html
--
Grzegorz Kossakowski
http://reflectingonthevicissitudes.wordpress.com/
