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

On Jan 18, 2008, at 05:23, Andreas Schweigstill wrote:

> 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.

No you can't. "merge" always operates on a working copy, never on a
repository directly. See "svn help merge". At least, it's that way in
1.4.6.

> 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".

---------------------------------------------------------------------
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 21:09:25 CET