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

On Wed, Jun 12, 2002 at 05:25:47PM +0100, Philip Martin wrote:

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

i'm not sure what's going on... try uncommenting the debug printf in
svn_cl__merge (you'll have to update it to make it compile since we
changed to const char *'s), and put a similar printf in
svn_cl__rollback and let me know what the difference is.

when i try things here, the printf's give me exactly the same output,
so i guess i'm just doing something different than you are...

-garrett

-- 
garrett rooney                    Remember, any design flaw you're 
rooneg@electricjellyfish.net      sufficiently snide about becomes  
http://electricjellyfish.net/     a feature.       -- Dan Sugalski
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org