Re: svn commit is failing

Thanks Jason. You did address one of the issues, i.e., rolling back the
revision. Thanks. I'll read up on the merge command as opposed to
checking out the source by revision on top of working copy.

Secondly, is there a way to fix the issue of not being able to get my
current working copy back into the repository?

Thanks,
Jeff

"Jason Connor" <jason.connor@gmail.com>
05/09/2007 02:36 PM

To
"JRancier@penntraffic.com" <JRancier@penntraffic.com>
cc
users@subversion.tigris.org
Subject
Re: svn commit is failing

I think the question is: what problem are you trying to solve here?

I'm not 100% sure what you were trying to do. But it seems that you
were trying to rollback a file to previous revision. If that's the
case, here's what I'd do:

When I rollback changes, I use 'svn merge'. It allows me rollback on
an individual file basis. Here's a sample command:

svn merge -r HEAD:2110 svn+ssh://host/repo/trunk/my_file.c

Assuming that 2110 isn't the latest revision in the repository, this
will rollback the working copy of 'my_file.c' to revision 2110.
You need to be in the working copy directory for this to work. And
you'll need to commit afterwards.

I hope this helps. If not, feel free to ignore me :-)

On 5/9/07, JRancier@penntraffic.com <JRancier@penntraffic.com> wrote:
>
> Hello,
>
> I need to checkout a previous version of a file to unbreak some changes.
> So, I did a co by revision number (the previous revision). That didn't
> work, so I did the same with for the next previous revision. I run svn
> status, and that file had an 'MM' as the flags. I could check it in, so
I
> 'revert'ed twice, copied my current file over the reverted changes, and
> attempted to check it back in. Here's the error I'm getting:
>
> svn failed: The version resource does not correspond to the resource
within
> the transaction. Either the requested version resource is out of date
> (needs to be updated), or the requested version resource is newer than
the
> transaction root (restart the commit).
>
> Is there any recovery here?
>

-- 
Jason Connor
"Depression is merely anger without any enthusiasm."
-- Steven Wright