Hi I am thinking of merging some changes from our gbuild branch (https://svn.apache.org/repos/asf/openoffice/branches/gbuild) and wondering how best to do it.
The gbuild branch and trunk have drifted apart, so my preferred workflow would be to diff specific files and then copy and paste small changes into trunk, testing on as many platforms as possible, and committing in many fine-grained commits. This would however lose the SVN history, and lose the fact those commits even came from that branch. Would that be ok? If not, what else should I do? Thank you Damjan --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
