You may need to just make a patch with your current working directory.
Then revert the revisions in your repository with a reverse merge or a
copy to from revision. Once you have done that check out the HEAD and
apply your patch. This seems to me it would be the best method to retain
the changes you have in your working dir. I'm sure someone will correct
me if I've got this wrong.
BOb
-----Original Message-----
From: Steven Woody [mailto:narkewoody_at_gmail.com]
Sent: Thursday, November 13, 2008 8:07 AM
To: Ryan Schmidt
Cc: users_at_subversion.tigris.org
Subject: Re: after checked out an old revision...
On Thu, Nov 13, 2008 at 1:37 PM, Ryan Schmidt
<subversion-2008c_at_ryandesign.com> wrote:
> On Nov 12, 2008, at 17:55, Steven Woody wrote:
>
>> the head is 100, and i checked out an old revision, say 95, and
>> finished many changes on the working copy. now, if i want to commit
my
>> working copy as revision 101 and do not take care anything from r95
to
>> r100, what should i do?
>>
>> thanks in advance.
>
> You're a bit backwards... Ideally you would *first* undo the changes
from
> 100 to 95, by doing a reverse merge:
>
> svn merge -r 100:95 url://to/repo/path/to/something .
>
> Then commit that:
>
> svn commit -m "Undoing revisions 96 through 100 because _______"
>
> Then make your new changes. Then commit those.
But ... the 'new' changes had been already made, and these changes are
in my current working directory, and the directory's BASE is 95 since
I checked out them using '-r95'.
So I think, if you meant to say:
1. create a new local directory and 'cd' to it.
2. under the new local directory, do the following:
svn merge -r 100:95 url://to/repo/path/to/something .
3. do 'svn ci -m "Undoing revisions 96 through 100 because _______"
4. cd to my old working directory that has a BASE of 95
5. do 'svn ci -m "...."'
But I don't sure if or not the step 5 will work because before I can
check it, subversion will found my revision is old than HEAD and it
may ask me to do 'svn update' first. Will that be a problem?
Thanks.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-13 15:44:25 CET