> 1) In TortoiseMerge is not posible send text to clipboard(when I can
> merge manualy, not in TM)
Select the lines, hit ctrl-c.
LJ> but only line. OK this is feature.
> 2) In Visual Foxpro Comments is when first char in line is * . When i
> add comment to program, TortoiseMerge do this
>
> first file(83 is line number in TM, no in file, - and + is remove line
> and add line:
>
> - 83 select * from xxxx
>
> second file:
>
> + 83 *comment add where
> + 84 select * from xxxx where yyy
>
> but in line is line 83 and 83, no line with select. This not compare
> line with select, compare line with select to line with comment
> e.g. synchronization is bad. Next line after this is OK
>Stefan
I'm sorry, but I don't understand what you're saying here. Line 83 was
removed in the left file (the BASE), and added in the right file (your
working copy). That happens every time you modify a line (old line
removed, new line added in the same place, effectively the line is
replaced).
LJ>this means when I add comment line before other line( and this line have modification),
LJ> I don't compare replaced line in bottom windows.
LJ>This means when Tmerge add blank line before + line( no after), compare will be better
LJ> now is:
LJ> left right
LJ> - /* comment */ + some code
LJ> - some code modific. (blank line)
LJ> maybe:
LJ> left right
LJ> - /* comment */ (blank line)
LJ> - some code modific. + some code
> 3) When i work with same class in VFP (i have open some in VFP) and in
> Tortoisesvn take command "Update", update fail (some copy fail becose
> open files). Local copy is then bad(no new update is OK, cleanUp don't
> fix it) and to fix is only this way:I must delete this directory and
> checkout this directory from repository.
>Stefan
I would consider this a bug in VFP (holding a file exclusively open). Of
course in that case Subversion can't update that file at all.
I agree however that the working copy should not get corrupted by this.
This issue has been reported on the Subversion mailing list, but I don't
know if someone is working on it or not.
LJ> OK. But problem is not in VFP (files are open). That is in TSVN or SVN, Subversion can't update OK, but Cleening (after exit VFP ) don't repair this problem(Why?). Repair=erase all dirrectory and 'Update' directory from repository
LJ>I don't try new type of repository SVN 1.4, only with 1.3
> 4) We were some problem with upper and lower letter in extension, this
> was fixed with our services, that normalize extension on the back.
> But withou this service, may be problem:
> I have same form:
> test.SCX, test.*sct* (two file together)
> I add this file to repository. In other dirrectory i checkout this files
> and rename file to test.SCX, test.*SCX *When I take command "Update", i
> will see, that directory is with red ikon(=not commited), but test.SCX
> have gree icon(commited)
>Stefan
That's how Subversion works on windows. Subversion itself is
case-sensitive, but the windows file system is not.
LJ>TSVN may update windows file to good (lower or upper)case. But OK.
> 5)TM not compare binary file. VFP9 files is for TM binary files. Will be
> in TSVN some program to binary compare?
>Stefan
Maybe someone can write a script to do it. But of course, VFP would have
to provide a COM interface and have the ability to compare its own files.
LJ>OK. I (or frends) write some programs to merge or compare some forms and class in VFP, but there is problem ... VFP have 2 file for 1 form, report,... Dif from TSVN have is only for 1 file
Lubos Jezek
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Oct 3 17:28:53 2006