TRUNK NEEDS MERGING TO 1.0

[JAAulde]

I edited several trunk files for #28 and #29 resulting in changeset r57. I committed those changes, but cannot get a merge to take place.

Using TortoiseSVN I opened the merge screen and told it to merge FROM the url to trunk TO the url to branches/1.0. But I do not see that the merge took place.

Now when I try to do it I get errors for missing targets in branches/1.0

I need someone to mesh what is in trunk to what is in branches/1.0

Thanks

[JAAulde]

As I think about this, I wonder--are you guys sure we are doing this in the right order?

Shouldn't it be like...only work on 1.0 code, and edit and commit branches/1.0 which you then merge to trunk. Then, down the road, when we are done with 1.0 we branch trunk to 1.1 and only work on 1.1 problems and edit and commit branches/1.1 and merge that to trunk. And so on and so on?

It seems backwards that we are editing trunk and mering it to branches...

[JAAulde]

disregard last comment...got clarification on IRC #blueflame

[JAAulde]

this doesn't need doing after all. there really shouldn't be a 1..0 branch yet. we'll edit turnk and branch it to 1.0 when the time comes to freeze 1.0 for release