Am Mittwoch, 28. März 2007 10:44 Patrice Dumas wrote: > That was not really my question... But it was poorly formulated, > admitedly. My question is who should merge the changesets that > are in the stable branch and not in the unstable?
I will take care of the unstable branch, Avi will keep maintaining the stable branch and the releases (hopefully together with this list + bugreports *g*). > I made changes > that I can merge, but they depend on previous changes that were > done by others (Avi, mostly). Looking at the svn logs, it seems like the > fork was done at release r941. On the stable branch Avi committed > changest r942 through r951. I don't know exactly what is relevant for > the unstable branch among those changes. Then there are the > changesets r953 and r955 I'd like to apply on the unstable branch. You are right with the release number r941. I think this is less a problem. All the filesys directory changes are already in the unstable branch. I can look through the others, but I think everything is merged or in conflict. The other way round is the bigger problem, there are some bug fixes in the unstable branch and a rewritten testing framework the stable version could also benefit from. Finding these things is awful work and I am not a svn guru and don't know how to merge the trees (I would rather develop unstable branch to a stable situation and make the next version out of it, any other ideas?). thank you Markus Raab ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Registry-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/registry-list
