Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: Obliterate questions

subversion
Discussion topic

Back to topic list

Re: Obliterate questions

Author mf
Full name Martin Furter
Date 2009-11-17 18:15:29 PST
Message On Wed, 18 Nov 2009, Julian Foad wrote:

> On Tue, 2009-11-17 at 12:50 -0800, Mike A wrote:
>> Martin Furter wrote:
>>> On Tue, 17 Nov 2009, Julian Foad wrote:
>>>> No, no, nothing will be corrupted. Part of the job of the software
>>>> functions that implement "obliterate a specified node-rev of file F"
>>>> will be to adjust any deltas, pointers, etc. in whatever way is needed
>>>> to make all other copies and revisions of F stay exactly as they were,
>>>> if the user doesn't want to obliterate all revisions and all copies of
>>>> F.
>>>>
>>>>> Additionally you just checkout HEAD and it still contains the parts
>>>>> which
>>>>> should have been obliterated.
>>>>
>>>> No. Same reason as above.
>>>
>>> OK, makes sense so far. But then we're back at my first question.
>>>
>>> Let's ignore all the FS implementation details and assume it stores
>>> fulltext for every revision. And I have added line 5 to the file hello.txt
>>> in revision 10 and changed that line in revision 20. Now I want to
>>> obliterate revision 10.
>>>
>>> If I understand you right obliterate would reverse merge that change to
>>> all revisions since r10. Wouldn't it lead to a conflict in r20 since it
>>> tries to merge a change to a line which has also been modified there?
>>>
>> That would only be true if the semantics of Obliterate were equivalent to
>> "Undo the changes in Rev 10." But the semantics of Obliterate are "Remove
>> Rev 10 from the repo leaving Rev 11 exactly as it was." IOW, the difference
>> between Rev 9 and Rev 11 should be unchanged by the Obliterate.
>
> Correct. Thanks, Mike.

Thank you all for the explanation.
And sorry for the noise.

Martin

« Previous message in topic | 16 of 17 | Next message in topic »

Messages

Show all messages in topic

Obliterate questions philip2 Philip Martin 2009-11-12 03:29:47 PST
     Re: Obliterate questions Julian Foad <julian dot foad at wandisco dot com> Julian Foad <julian dot foad at wandisco dot com> 2009-11-12 04:19:39 PST
         Re: Obliterate questions brane Branko Cibej 2009-11-12 09:03:59 PST
             Re: Obliterate questions philip Philip Martin 2009-11-16 02:17:36 PST
                 Re: Obliterate questions brane Branko Cibej 2009-11-16 04:40:20 PST
                     Re: Obliterate questions philip Philip Martin 2009-11-16 05:00:01 PST
                         Re: Obliterate questions brane Branko Cibej 2009-11-16 05:07:19 PST
                         Re: Obliterate questions mf Martin Furter 2009-11-16 10:43:35 PST
                             Re: Obliterate questions philip Philip Martin 2009-11-16 11:31:28 PST
                                 Re: Obliterate questions Daniel Shahaf <d dot s at daniel dot shahaf dot name> Daniel Shahaf <d dot s at daniel dot shahaf dot name> 2009-11-16 13:01:56 PST
                                     Re: Obliterate questions mf Martin Furter 2009-11-16 14:13:10 PST
                                         Re: Obliterate questions Julian Foad <julian dot foad at wandisco dot com> Julian Foad <julian dot foad at wandisco dot com> 2009-11-16 16:28:32 PST
                                             Re: Obliterate questions mf Martin Furter 2009-11-17 10:26:43 PST
                                                 Re: Obliterate questions Mike A <mabraham at monitor dot com> Mike A <mabraham at monitor dot com> 2009-11-17 12:50:33 PST
                                                     Re: Obliterate questions julianfoad Julian Foad 2009-11-17 16:46:24 PST
                                                         Re: Obliterate questions mf Martin Furter 2009-11-17 18:15:29 PST
         Re: Obliterate questions julianfoad Julian Foad 2009-11-13 18:05:05 PST
Messages per page: