TortoiseMerge /Create-Apply patch issues
zaf646
Bit -dev, 2011/05/17 21:18:02.
Here are a couple of issues I have noticed with TortoiseMerge:
1) Whenever I apply a patch, I get a window poping up saying that some
files have been changed outside T-Merge (which I believe should be
"ToirtoiseMerge" for consistency). Isn't it obvious, that since I
apply a patch the file will be changed? Can't this case be handled
differently, i.e. by not showing that popup window at all? If I choose
reload then the changes are gone, I can't see what the patch file has
changed (no highlighting of the modifications).
2) If a patch includes new files, then those are not automatically
added in the svn anymore. This started to happen lately, not sure at
which revision though.
3) If a patch contains whole file deletions then the deleted files are
not marked as deleted in the svn.
4) When I open the create patch dialog I notice an "Options" button
showing and then going away when the files are loaded in the dialog.
It's like it's not anchored in the right place.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2740798
To unsubscribe from this discussion, e-mail: [dev-uns...@tortoisesvn.tigris.org].
Stefan Küng
> I'm using the nightly builds, atm TortoiseSVN 1.6.99, Build 21396 - 32
> Bit -dev, 2011/05/17 21:18:02.
>
> Here are a couple of issues I have noticed with TortoiseMerge:
>
> 1) Whenever I apply a patch, I get a window poping up saying that some
> files have been changed outside T-Merge (which I believe should be
> "ToirtoiseMerge" for consistency). Isn't it obvious, that since I
> apply a patch the file will be changed? Can't this case be handled
> differently, i.e. by not showing that popup window at all? If I choose
> reload then the changes are gone, I can't see what the patch file has
> changed (no highlighting of the modifications).
Fixed in r21408.
> 2) If a patch includes new files, then those are not automatically
> added in the svn anymore. This started to happen lately, not sure at
> which revision though.
Should be fixed in r21410: it worked ok when saving the file with the
'save' button, but failed to work if you used 'patch all'.
> 3) If a patch contains whole file deletions then the deleted files are
> not marked as deleted in the svn.
That however still works ok for me. Are you sure the resulting file is
completely empty?
Ok, the file is not removed with 'svn rm' but only removed. But svn will
show that file as 'missing'.
> 4) When I open the create patch dialog I notice an "Options" button
> showing and then going away when the files are loaded in the dialog.
> It's like it's not anchored in the right place.
Fixed in r21409.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2741509
zaf646
About #2. The file is deleted but marked as missing. Shouldn't it be
actually marked as deleted?
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessa...
>
> To unsubscribe from this discussion, e-mail: [dev-unsubscr...@tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2741510
zaf646
svn, then "Undo Add" does nothing when run through the "Create Patch"
dialog. This is with TortoiseSVN 1.6.99, Build 21410 - 32 Bit -dev,
2011/05/19 22:21:36.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2742302
Stefan Küng
> Another thing I noticed. If I have added an unversioned file in the
> svn, then "Undo Add" does nothing when run through the "Create Patch"
> dialog. This is with TortoiseSVN 1.6.99, Build 21410 - 32 Bit -dev,
> 2011/05/19 22:21:36.
Fixed in r21414.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2742312
Stefan Küng
> Thanks for fixing those issues. I'll try the next nightly build.
>
> About #2. The file is deleted but marked as missing. Shouldn't it be
> actually marked as deleted?
I'd like to keep it as missing: that way you have to review the deletion
before a commit (not checked by default).
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2742314
zaf646
TortoiseMerge still has various issues. For example when I paste two
lines between existent lines the result is not the expected one.
I want to paste these 2 lines:
NEW TEXT1
NEW TEXT2
Original:
Random text1
Random text2
becomes:
Random text
NEW TEXT1
NEW TEXT2Random text 2
Also, when there is a tab, the cursor doesn't move along like it was a
tab but more like it's multiple spaces.
Try this:
BUILD:<TAB>CHECK $(MY_APP)
try to select the line from the beginning and watch the cursor.
Thanks for the quick fixes. :)
On 20 Μάϊος, 16:45, Stefan Küng <tortoise...@gmail.com> wrote:
> On 19.05.2011 21:35, zaf646 wrote:
>
> > Thanks for fixing those issues. I'll try the next nightly build.
>
> > About #2. The file is deleted but marked as missing. Shouldn't it be
> > actually marked as deleted?
>
> I'd like to keep it as missing: that way you have to review the deletion
> before a commit (not checked by default).
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessa...
>
> To unsubscribe from this discussion, e-mail: [dev-unsubscr...@tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2742319
Oto BREZINA
> I see your point. I guess I can live with that. :)
>
> TortoiseMerge still has various issues. For example when I paste two
> lines between existent lines the result is not the expected one.
>
> I want to paste these 2 lines:
> NEW TEXT1
> NEW TEXT2
>
> Original:
>
> Random text1
> Random text2
>
> becomes:
>
> Random text
> NEW TEXT1
> NEW TEXT2Random text 2
>
> Also, when there is a tab, the cursor doesn't move along like it was a
> tab but more like it's multiple spaces.
> Try this:
>
> BUILD:<TAB>CHECK $(MY_APP)
>
> try to select the line from the beginning and watch the cursor.
--
Oto BREZINA, Printflow s.r.o., EU
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2742339
Stefan Küng
> On 2011-05-20 15:59, zaf646 wrote:
>> I see your point. I guess I can live with that. :)
>>
>> TortoiseMerge still has various issues. For example when I paste two
>> lines between existent lines the result is not the expected one.
>>
>> I want to paste these 2 lines:
>> NEW TEXT1
>> NEW TEXT2
>>
>> Original:
>>
>> Random text1
>> Random text2
>>
>> becomes:
>>
>> Random text
>> NEW TEXT1
>> NEW TEXT2Random text 2
> Seems be more related bugs in that code. Will fix it this evening.
Just tried this: seems to work ok for me.
It depends on how you selected the two lines to insert: if the second
line wasn't selected/copied *without* the EOL, then you get what you
describe. But if it was selected with the EOL, then I get
Random text
NEW TEXT1
NEW TEXT2
Random text 2
As I would expect.
>> Also, when there is a tab, the cursor doesn't move along like it was a
>> tab but more like it's multiple spaces.
>> Try this:
>>
>> BUILD:<TAB>CHECK $(MY_APP)
>>
>> try to select the line from the beginning and watch the cursor.
> Will take care about this this weekend.
Ok, just a hint to make it easier for you to find the problem and fix it:
This is a problem with the coordinates:
the selection is now handled with view coordinates, but the drawing
still happens with screen coordinates.
At least that's what I think from a quick glance over the code...
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2742342
Oto BREZINA
>
> This is a problem with the coordinates:
> the selection is now handled with view coordinates, but the drawing
> still happens with screen coordinates.
>
> At least that's what I think from a quick glance over the code...
based' (tab is one point) and one with tab expanded (tab is tabwidth
points).
I'm not sure if 'char based' was not introduced (by missunderdanding) by
me or not, but it seems to be good to remove one of then, just not sure
which one. Side note: tab handling as is (expand to char) does not
support KANJI properly (would not align - what is tabs purpose) so I
guess we will need some rewrite tab handling and/or
ScreenPosition<->ViewPosition calculation.
For a moment I want easy solution
to clean up bugs pollution :)
While using TabbedTextOut or similar function seems to be good solution
for most tab handling. However it would make drawing white spaces (tabs
namely) harder. I does not work at all with KANJI right now.
I still don't get thru inline diff colorer to find best solution.
> Stefan
--
Oto BREZINA, Printflow s.r.o., EU
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2742351
Oto BREZINA
> On 2011-05-20 15:59, zaf646 wrote:
>> I see your point. I guess I can live with that. :)
>>
>> TortoiseMerge still has various issues. For example when I paste two
>> lines between existent lines the result is not the expected one.
>>
>> I want to paste these 2 lines:
>> NEW TEXT1
>> NEW TEXT2
>>
>> Original:
>>
>> Random text1
>> Random text2
>>
>> becomes:
>>
>> Random text
>> NEW TEXT1
>> NEW TEXT2Random text 2
> Seems be more related bugs in that code. Will fix it this evening.
--
Oto BREZINA, Printflow s.r.o., EU
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2742429
67rw...@gmail.com
But with tortoisemerge 1.9.7 build 27867 I have the same problem.
Furthermore with the syntax: tortoisemerge /base:base.txt /mine:mine.txt /diff:diff.txt
is opened the explorer.
Thanks