[unclassified] [Box Backup] Portability and public source depot

[Nick Knight]

Ok I think I have it now

Untar a version of 0.08 in a directory called nick
Check it in
Untar my port over the top then update svn

I have been working on the files with no header (copyright stuff) in
them - is this the correct version to merge in?

-----Original Message-----
From: boxbackup-admin@fluffy.co.uk [mailto:boxbackup-admin@fluffy.co.uk]
On Behalf Of Martin Ebourne
Sent: 24 October 2005 11:05
To: boxbackup@fluffy.co.uk
Subject: Re: [unclassified] [Box Backup] Portability and public source
depot

On Thu, 2005-10-20 at 13:04 +0100, Ben Summers wrote:
> The win32 stuff has been made to a vaguely unknown version of Box =20
> Backup, probably 0.08 plus changes from 0.09. It's also likely to =20
> need a lot of tidying to make it fit well within the existing =20
> sources, not break anything, and be able to compile both UNIX and =20
> Win32 from the same tree.
>=20
> What's the best way of approaching this problem?

It is perhaps a shame that you started the repository from 0.09, rather
than checking in older copies first. If 0.08 had been available I think
we could have branched from that, checked Nick's port in on top of it,
and then merged. I think any changes present in both copies would have
just been accepted.

However, I'm sure we can come up with something similar. I think the key
thing is that the win port must not be checked in on a branch from 0.09
or it will look like all the newer stuff has been deleted. Instead make
a new subdirectory in the repository, check in 0.08. Then check in
Nick's port on top of it. We should then be able to merge across from
there onto other branches or trunk.

Nick, if you've got the version of box you started working from, then
using that to seed the new directory instead of 0.08 would be even
better.

It's pretty easy to check a new tarball in on top of an old one - just
untar into the working copy, svn add new files, svn rm deleted files,
sanity check with svn st, then svn ci.

As to the tidying needed, we can work on that once it is in the
repository.

Any q's, just ask.

Cheers,

Martin.

_______________________________________________
boxbackup mailing list
boxbackup@fluffy.co.uk
http://lists.warhead.org.uk/mailman/listinfo/boxbackup