On 26.02.2005, at 11:37, Michael Abbott wrote:
> Max Bowsher wrote:
>>>> Another developer has just committed 76 and 77, both of which I
>>>> just want to
>>>> throwaway. They contain problem code that's way easier to just
>>>> ignore (and
>>>> start over) than to try and merge.
>>>
>>> Since you've currently got a working copy, I'd do this:
>>> * Make a copy of the file
>>> * Revert it
>>> * Update it to version 77
>>> * Copy the other file back in it's place.
>>
>> Alternatively,
>> http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.2
>
> But doesn't that mean that you have to apply the other developer's
> changes (including merging any conflicts) and then un-apply them again
> via a reverse merge?
As I see it, a working copy is for doing *one* thing at a time. You're
now trying to do two things -- revert a change another developer made,
and make a change of your own. Do these things one at a time.
Since I don't know how many files you or the other developer each
changed, the safest way to solve this problem is for you to make a
completely new working copy of HEAD. In this working copy, undo the
change the other developer made, with something like this:
svn merge -r 77:75 url://to/thing/in/repository
Test the working copy, make sure it works like you want it to, and that
the other developer's changes are gone. Commit it, and in the commit
message, state that you're undoing so-and-so's work from revisions 76
and 77.
Now you can go go back to your first working copy and do an update and
then commit your new changes with a new commit message.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Feb 26 13:42:33 2005