Re: svn commit: rev 2162 - trunk/subversion/clients/cmdline trunk/subversion/tests/clients/cmdline/getopt_tests_data

"Sander Striker" <striker@apache.org> writes:

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

The file is unmodified at rev 8. That's the same as rev 6 when it last
changed. I want to rollback to rev 5. What's to revert?

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org