On 06/27/2011 10:34 AM, Tim Flink wrote:
I went through and did a merge of master into stable in order to bring
it up to date.
As a test run, I pushed it up to github instead of the fedorahosted
repo:
https://github.com/tflink/autoqa-devel
If this change is OK, I can push to the fedorahosted repo.
Tim
Hey Tim, could you please next time push to some branch in our git repo instead? I
don't understand the reason to push to another repo. It's much easier to look at a
particular branch than to add a new remote repo.
Now that I know how to do it:-), I'll share with others:
$ git remote add tf
git://github.com/tflink/autoqa-devel.git
$ git fetch tf
Now when I do:
$ git diff origin/master tf/stable
I see some weird differences, I don't think the code is ok. You tried to merge it,
right? That's the reason why I suggested diff-patch approach [1], to be sure that
stable is exactly same as 0.5.0 as tagged in master.
If there are no further changes waiting, I'll gladly tag the release and update the
stable branch.
[1]
http://piratepad.net/M9RUj1qAe2