>
> Maybe you should check out emacs, it has some pretty
> powerful interactive
> merge abilities that let you select particular
> chunks to apply, shows you
> the exact parts that changed and you can edit the
> document at the same
> time.
>
It's not that long since I bothered to learning
m
On Tue, 01 Mar 2005 20:08:23 +, Oliver Stieber wrote:
> CVS integration wasn't working properly, and I keep
> getting errors like
> no depot spec at
> /usr/lib/perl5/vendor_perl/5.8.5/SVK/XD.pm line 280.
Yes, don't try and branch from CVS directly. It supports that but there
are some bugs tha
--- Mike Hearn <[EMAIL PROTECTED]> wrote:
> On Tue, 01 Mar 2005 19:15:38 +, Oliver Stieber
> wrote:
> > I'll give it another go, svk doesn't seem too
> happy
> > though.
>
> What went wrong last time?
CVS integration wasn't working properly, and I keep
getting errors like
no depot spec at
/
On Tue, 01 Mar 2005 19:15:38 +, Oliver Stieber wrote:
> I'll give it another go, svk doesn't seem too happy
> though.
What went wrong last time?
> I've had a look around and still can't find a simple
> merge tool, or a simple tool that lets me edit and
> merge at the same time.
I'm not sure
>
> It does exist, SVK can do that and I've been using
> it to manage
> incremental diffs with the DCOM stuff. Only issue is
> that it needs to be
> set up first.
>
> Basically:
>
> 1) Install SVK
> 2) Do an "svk import" of the clean WineHQ source
> tree
> 3) Build it
> 4) Apply your first patch
On Tue, 01 Mar 2005 17:02:40 +, Oliver Stieber wrote:
> patch -p 0 --dry-run -i
> ../../wined3d_texture_interface_separation_os_1.patch
>
> worked ok for me,
>
> patch --dry-run ... didn't
> it looks like patch is stripping 1 path by default on
> my system.
But that is correct, no? I alwa
On Tue, 01 Mar 2005 18:01:54 +, Oliver Stieber wrote:
> if one doesn't exist I'll write it and put it on my
> site.
It does exist, SVK can do that and I've been using it to manage
incremental diffs with the DCOM stuff. Only issue is that it needs to be
set up first.
Basically:
1) Install SVK
> wrote:
> > > > Hi,
> > > >This patch start to separate the interfaces
> in
> > > > wine3d3. Complete separation requires
> > > queryInterface
> > > > support which I'll send through soon, this
> patch
> > > has
> > > > no dependencies but provides the final
> interface
> > > > needed by late
--- Paul Vriens <[EMAIL PROTECTED]> wrote:
> On Mon, 2005-02-28 at 23:26, Oliver Stieber wrote:
> > Hi,
> >This patch start to separate the interfaces in
> > wine3d3. Complete separation requires
> queryInterface
> > support which I'll send through soon, this patch
> has
> > no dependencies b
