[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: rev 1579 - trunk trunk/subversion/libsvn_wc trunk/subversion/libsvn_client

From: Blair Zajac <blair_at_orcaware.com>
Date: 2002-03-29 03:51:51 CET

Ben Collins-Sussman wrote:
>
> sussman@tigris.org writes:
>
> > More work toward 'svn merge'.
> >
>
> Silly things you can try At This Time:
>
> svn co http://svn.collab.net/repos/svn/trunk/subversion/libsvn_wc
> cd libsvn_wc
> svn merge . -r 1570:1550
> svn status
> svn merge . -r 1550:1570
> svn status
>
> Notice that the final status command shows no local mods, which is
> exactly correct.

That's pretty cool.

If you try doing something stupid like this with using an odd revision
range, then I get a warning:

    svn co http://svn.collab.net/repos/svn/trunk/subversion/libsvn_wc
    cd libsvn_wc
    svn merge . -r 1300:1000

C ./props.c
G ./diff.c
C ./entries.c
C ./copy.c
G ./util.c
C ./wc.h
C ./adm_crawler.c
C ./log.c
C ./adm_ops.c
C ./adm_files.c
C ./status.c

svn_error: #21086 : <RA layer request failed>
  PROPFIND of /repos/svn/trunk/subversion/libsvn_wc/get_editor.c: 404 Not Found

Should svn protect people from doing something like this or have a better
message?

Best,
Blair

-- 
Blair Zajac <blair@orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 29 03:53:07 2002

This is an archived mail posted to the Subversion Dev mailing list.