[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-03-22 00:06:43 CET

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.

My next step is to hack on Philip's repos-diff editor. I need to
convert it to the "new" editor interface, so it can be composed with
the update trace-editor. It also needs to call callbacks for
receiving propchanges and directory adds/removals.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 22 00:07:52 2002

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