I've done the merge. Possibly buggy, as I haven't tested as I don't
want to install again from the trunk until the release is sorted
out...
On 22/10/2007, Noel O'Boyle <bao...@gm...> wrote:
> On 22/10/2007, Adam Tenderholt <a-t...@st...> wrote:
> > Is there a reason it should be a copy instead of another merge?
> I started doing the merge (--bidirectional according to the
> svnmerge.py docs) but then I realised that you had already done it for
> me, and sorted out all of the conflicts.
>
> > Is
> > copy smart enough to know when two files are the same, or does it
> > overwrite duplicates anyway?
>
> I know that I'm not smart enough to know the answer. But I think that
> the end result is the same. I guess I'll go ahead with the merge if it
> doesn't seem to make sense.
>
> BTW, I've just been to see Jorge Cham of Piled Higher and Deeper. Very
> funny guy.
>
> Noel
>
> > Adam
> >
> > On Oct 22, 2007, at 1:36 AM, Noel O'Boyle wrote:
> >
> > > Hi Adam,
> > >
> > > Can you just "svn cp" the ORCA branch onto the trunk, now that you've
> > > just done that merge?
> > >
> > > Noel
> >
> >
>
|
