On Mar 27, 7:25 am, "Ben Ford" <[EMAIL PROTECTED]> wrote:
> Wouldn't you know it I have a very good book on svn (the pragmatic one) but
> it's in New Zealand and I'm in Indonesia! Doh!
There's also the great and free SVN Book available on the web:
http://svnbook.red-bean.com/
Hope this helps,
Thanks very much guys,
Wouldn't you know it I have a very good book on svn (the pragmatic one) but
it's in New Zealand and I'm in Indonesia! Doh!
A ray of hope might be that I don't think that muliple-db-support changed
that many files so it might not to soul destroying to fix the merge. If
someon
Russell Keith-Magee wrote:
> The branches are all independent, and depending on how active the
> branch is, a branch may not be up to date with the trunk, let alone
> other branches. If one branch were to cleanly merges into another, I
> would be extremely surprised - doubly so for the more compl
On 3/27/07, Ben Ford <[EMAIL PROTECTED]> wrote:
> Hi there,
>
> I tried to merge the
> multiple-db-support branch onto my working copy, merging r3198:HEAD as 3198
> was when the branch was created, but it failed and i ended up with a lot of
> < .working and similar dotted around the files.
Th
Hi there,
First off sorry for asking a 'non-django-dev' question here...
I've been playing with a number of different branches recently (gis,
boulder-oracle-sprint and now multiple-db-support). My working copy is the
gis branch with a lot of the boulder-sprint stuff merged in (
