[Box Backup] Win32
Tue, 25 Oct 2005 00:37:28 +0100
On Mon, 2005-10-24 at 21:19 +0100, Nick Knight wrote:
> I think - is in svn now. I haven't tested a check out or build though!!!
Well the plan seems to have worked anyhow.
I've made a copy of your stuff (sans boost) in martin/test so I could
try things out on it. Firstly I merged it onto trunk (in my working copy
only!) to be up to date with box 0.09. This generated a whole bunch of
conflicts. On investigation it was the bad old line feed issue causing
whole file conflicts.
[ ASIDE: At some point we should set the svn:eol-style property on all
files. This should then prevent the linefeeds from being a problem by
making subversion do the conversion as appropriate. See
http://svnbook.red-bean.com/en/1.1/ch07s02.html for more info. Probably
after it's all merged into trunk would be a good time. ]
For now I've dos2unixed all apart from the windows files in martin/test.
After that, the merge was fine. There were 3 conflicts, all of which
were Nick removing BOX PRIVATE lines so those are easy to solve.
The results look sane, though I've not attempted to compile them.
I then went on to merge all the other branches (except autoconf) in my
working copy. On average I got one conflict from each, almost all minor.
Then finally I merged autoconf, which amazingly only got 4 files
conflicted, again nothing too drastic to sort out. However, this isn't
the whole story since there'll need to be some work done on the windows
changes to make sure they're fully autoconfed too.
Note that I'm not proposing we go ahead and merge right now - obviously
there's cleanup needed in some cases, and code review in all.