Does anybody have an idea about that bug ?
Anthony Ogier a écrit :
> Now, I have TortoiseSVN 1.4.3, Build 8645 (latest), and I still have
> the problem. And it is *not* due to manual editing of patchfile !
> Here is another procedure :
> * From my local SVN, I modify the files :
> o project/pom.xml
> o project/module_1/pom.xml
> o project/module_2/pom.xml
> * Then, I right-click on project > TortoiseSVN > Create patch...
> * After creating the patch (with default parameters), I do a
> right-click on project > TortoiseSVN > Revert, and I revert all
> my changes
> * Now, I right-click on project > TortoiseSVN > Apply patch..., I
> select my patch file, and then, I have a list of "File patches"
> in the GUI containing only "pom.xml" files (that's good), but 2
> of them are red ! (that's bad...)
> * When clicking on a red "pom.xml", I've got that message :
> The file pom.xml
> was found twice!?!
> This usually happens if you applied a patchfile to the
> wrong folder!
> ... I think it's definitively a bug in Tortoise isn't it ?
> Stefan Küng a écrit :
>> Anthony Ogier wrote:
>>> OK, I'm working on integrating an open source project which has its
>>> own svn. For our developments, we have a copy of that svn in our own
>>> Sometimes, I must merge the updates made on the official project to
>>> our own version.
>>> To do that,
>>> * I checkout the official trunk with the last revision I've merged
>>> into our version (let's call that revision X), and then
>>> TortoiseSVN > Merge.
>>> * Here, I fill "from revision" with X, and "to HEAD revision" and I
>>> get the "Unified diff".
>> But you don't merge.
>>> * I edit the generated .patch and replace all the "--- ... (revision
>>> X)" with "--- ... (revision Y)" (Y is our current trunk revision),
>>> and "+++ ... (revision Z)" with "+++ ... (working copy)" (Z is the
>>> current official trunk revision).
>> Here's the problem: the unified diff you get from the merge is not
>> the same as you would get if you would have completed the merge and
>> then choose TortoiseSVN->Create patch. And only patchfiles generated
>> with that command will actually work ok. Manually editing a
>> patchfile, and especially one not generated with "create patch" just
>> isn't right and leads to all kinds of errors.
>> The patch algorithm in TortoiseMerge can't handle patchfiles which
>> don't match exactly.
Received on Wed Feb 21 16:36:39 2007