svn merge -- woot woot!

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

And in this ring... watch us apply the differences between two
branches into a working copy!  (Okay, tags, really, but no difference.)

[sussman@kepler:~/projects/test/libsvn_wc]$ svn merge http://svn.collab.net/repos/svn/tags/0.9/subversion/libsvn_wc http://svn.collab.net/repos/svn/tags/0.8/subversion/libsvn_wc 
C  ./props.c
C  ./diff.c
C  ./entries.c
C  ./copy.c
G  ./README
C  ./util.c
C  ./wc.h
C  ./adm_crawler.c
C  ./log.c
C  ./adm_ops.c
C  ./adm_files.c
C  ./status.c

subversion/libsvn_wc/merge.c:59
svn_error: #21029 : <Can't find an entry>
  svn_wc_merge: `get_editor.c' not under revision control


Of course there are conflicts and errors, I would expect no less.
That's what you get when you try to merge an arbitrary changeset into
your working copy.  :-)

Still, this is good progress.

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