Re: n00b repository question

On Tuesday 01 August 2006 18:27, Ulrich Eckhardt wrote:
> On Tuesday 01 August 2006 04:13, Jon Biddell wrote:
> > Website developed outside subversion - customised for my employer.
> > New website from the supplier which has to replace the "live"
> > website.... BUT our changes to the "live" site must be merged into
> > the new one from the supplier, and then released...

[much snipping occured >here<]

Uli,

Many thanks for those helpful hints. Part of my problem, IMHO, was a
case of install-before-rtfm, unfortunately.

I'm going to read the book overnight and try your suggestions again
tomorrow.

While I'm happy, nay, I *prefer* to work with a command line tool,
another less Linux-savvy member of the team is making noises about a
GUI of some sort that will allow diff compares and manual merges /
commits - I believe TRAC will allow part of this, but it has to be a
completely foolproof system - which, as we all know, does not exist !!

I'm also trying all of this on a Mac Powerbook, but ultimately it will
run on a Debian box (probably my spare Qube2).

Again, my thanks...

Jon

-- 
You will not be elected to public office this year.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org