Laurent Sansonetti
lsans****@apple*****
Tue Aug 15 06:40:00 JST 2006
On Aug 14, 2006, at 4:03 PM, kimura wataru wrote: >> Finally, there is this "apple-unstable" branch. The version of >> RubyCocoa in Leopard has been produced from this branch. I think it >> would be great to start merging the content of this branch into >> trunk. >> I have a long list of things in my TODO list for RubyCocoa that I >> will >> work on in the next weeks (I will BTW write an e-mail about this >> soon). I propose that we either merge changes from apple-unstable >> into >> trunk, or that we rename apple-unstable into trunk (and rename trunk >> into something else). Having 2 different branches is a mess to >> maintain, I am not against having a stable and unstable branch >> though. >> Any idea about solving this? >> > I tested to merge apple-unstable into trunk with "svn merge --dry- > run". > > % svn merge --dry-run -r981:HEAD https://svn.sourceforge.net/svnroot/rubycocoa/branches/apple-unstable/src > > Then, following 3 conflict files were found. > > C ChangeLog > C install.rb > C metaconfig > > I think these conflicts are not so complex, and I believe that we can > solve them. I attached all of log on "svn merge". > Thank you Kimura-san. I solved the conflicts on my working copy. Shall I commit everything? Laurent
