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

Re: subversion merge help

From: Florian Pose <florian_at_keenkiwi.de>
Date: 2006-02-26 11:31:45 CET

jeremy8fc schrieb:
> It took me a bit longer to get svnserve running ... Now my work folder is
> out of sync having the current changes for the past three days. Is there a
> way to merge this current work folder with a working copy from the
> repository.

If I understood you right, your work folder is no working copy yet. Why
don't you create a new working copy of the newest revision with "svn co"
on your working place and then copy the changed files of your work
folder into it? Subversion will automatically detect your changes.

Regards,
Florian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Feb 26 11:37:53 2006

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