skel_usage status

["Glenn A. Thompson" <gt...@cdr.net>]

Hey:

So the cmpilato skel changes pass all the FS tests now?
I saw an issues posting that seemed to indicate that.

gat



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: skel_usage status

[Philip Martin <ph...@codematters.co.uk>]

Ben Collins-Sussman <su...@collab.net> writes:

> >  When I test it by hand, merging files seems to work but
> > adding/removing directories fails, even if I patch round the --force
> > problem.  Is this a know limitation or did this work in the past?
> 
> No, directory addition and deletion definitely used to work in my
> hand-tests, when I first wrote the merge code.  :-(

I sort of expected that, given the code that exists. It doesn't appear
to work at the moment.  I'll investigate.

-- 
Philip

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: skel_usage status

[Ben Collins-Sussman <su...@collab.net>]

Philip Martin <ph...@codematters.co.uk> writes:

> So what is the status of 'svn merge' at the moment, how much is
> expected to work?

Well, the only bug *I* know of is the fact that in the command

    'svn merge -rX:Y path dest-path'

... the 'dest-path' argument is currently being ignored;  all local
mods are happening in '.'  (see issue #700).

>  When I test it by hand, merging files seems to work but
> adding/removing directories fails, even if I patch round the --force
> problem.  Is this a know limitation or did this work in the past?

No, directory addition and deletion definitely used to work in my
hand-tests, when I first wrote the merge code.  :-(

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: skel_usage status

[Philip Martin <ph...@codematters.co.uk>]

Ben Collins-Sussman <su...@collab.net> writes:

> so I didn't run
> 'make check', thinking "why bother, we have no merge tests yet."

I didn't realise this :-(

It appears the changes I made recently to 'svn rm' affect 'svn merge',
merge may need a '--force' argument to allow it to remove locally
modified files/directories.

So what is the status of 'svn merge' at the moment, how much is
expected to work?  When I test it by hand, merging files seems to work
but adding/removing directories fails, even if I patch round the
--force problem.  Is this a know limitation or did this work in the
past?

-- 
Philip

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: skel_usage status

[Ben Collins-Sussman <su...@collab.net>]

"Glenn A. Thompson" <gt...@cdr.net> writes:

> Hey:
> 
> So the cmpilato skel changes pass all the FS tests now?
> I saw an issues posting that seemed to indicate that.

Yes, apparently.  Although my tweak to 'svn merge' (r1884) seems to
have broken some python diff tests.  I'll fix this ASAP.  My bad... I
forgot that diff and merge both shared that editor, so I didn't run
'make check', thinking "why bother, we have no merge tests yet."

Bad, bad me.  :-(


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org