> From: Philip Martin [mailto:pm@localhost.striker.xs4all.nl]On Behalf Of
> Philip Martin
> Sent: 12 June 2002 18:08
> rooneg@tigris.org writes:
>
> > Author: rooneg
> > Date: 2002-06-12 04:15 GMT
> > New Revision: 2162
> >
> > Added:
> > trunk/subversion/clients/cmdline/rollback-cmd.c
> > Modified:
> > trunk/subversion/clients/cmdline/cl.h
> > trunk/subversion/clients/cmdline/main.c
> > trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout
> > trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout
> > trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout
> > trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_stderr
> > Log:
> > Add an 'svn rollback' command, which reverts a given revision in your working
> > copy using svn_client_merge().
>
> What am I doing wrong?
>
> % svn st -v bar
> _ 8 6 pm bar
> % svn rollback -r5 bar
> C ./bar
>
> Why is that a conflict when the merge seems to work
>
> % svn revert bar
> Reverted bar
> % svn merge -r6:5 bar bar
> G ./bar
>
> or
>
> % svn revert bar
> Reverted bar
> % svn merge -r8:5 bar bar
> G ./bar
The implementation isn't reverting the file in the working copy prior to
merging AFAICT. That's prolly the problem.
Sander
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 12 18:15:01 2002