> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > Sent: Tuesday, June 10, 2008 9:30 AM > To: [email protected] > Subject: Re: Git qpid-port repo has a new "windows" branch > > > Steve Huston escribió: > > 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 > > > Don't trust me, as I'm a git newbie.
Me too. > But looking at the graph, it seems > to me that the windows branch has a set of commits, marked as > authored > by tross, gsim, nsantos, etc, related with QPID jira issues as: That could be... I may have updated svn onto windows branch before applying the patches. If you want to update master from svn, please feel free. I will do so this afternoon if you don't get to it. > I thought that the workflow should be: > -Somebody is updating the master, importing changes from the qpid > original repository. The more frequently, the better. > -People working in windows and/or solaris branches, should > merge changes from the master. That's fine. But is it a problem if each branch picks up changes from svn as well? At some point, the patches we supply back via jira are going to have to be made against the "current" svn, whether we're getting it via master or on the branch, I don't see why it makes a difference. If anyone with more git experience has input, we're all ears... -Steve
