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

Re: How to take back a revision from the trunk of a working copy?

From: Andreas Schweigstill <andreas_at_schweigstill.de>
Date: Fri, 18 Jan 2008 12:23:50 +0100


B. Bogart schrieb:
> The only solution I found was to copy the changes files out of the
> working copy, update to the latest revision, copy the old files back
> over the current working copy and commit.
> All the merge -c stuff did not solve the issue.

You can do the "svn merge -c" stuff on the repository instead of your
working copy, so this operations wouldn't be affected by your changed
files in the WC.

Afterwards do an "svn update" on your WC, so it is on the HEAD revision
but it will either keep your local changes (for files which haven't been
changed between r226 und r227) or merge them with the changes. When
merging was not successfull for certain files they will have a "C" when
running "svn status" or "svn status -q".

With best regards
Andreas Schweigstill

Dipl.-Phys. Andreas Schweigstill
Schweigstill IT | Embedded Systems
Schauenburgerstraße 116, D-24118 Kiel, Germany
Phone: (+49) 431 5606-435, Fax: (+49) 431 5606-436
Mobile: (+49) 171 6921973, Web: http://www.schweigstill.de/
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-18 12:45:04 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.