Hi Manuel, > Looking at the graph of the repository, it seems to me that you're > upgrading the windows branch with patches fetched from the qpid svn > repository. As seen in: > > http://github.com/shuston/qpid-port/network
I'm not sure the graph reflects that. What I did was: - Create the git repo - Update from Apache svn - Branch windows - Apply the patches and additions I put in Jira to the windows branch > I thought that perhaps it would be better to keep the main branch > synched with the svn repository,and then, merge changes from the main > branch into the port branches. I believe that's what I did. > Otherwise, both the solaris and windows > branches will have to read and apply changes from the > external qpid svn > repo. Don't you think it would be better to merge from an > updated main > branch in sync? I think that should be also better to > generate patches > against the qpid repo, as easy as comparing with the main branch. > > What do you think? I agree completely, and that is what I thought I did. If you can see something I did incorrectly, I'd like to know how to correct it. Thanks, -Steve
