Login | Register
My pages Projects Community openCollabNet

Discussions > dev > Confused Display on submerge

subcommander
Discussion topic

Back to topic list

Confused Display on submerge

Author Toshihiro Kouno <tkouno1 at md dot nsw dot co dot jp>
Full name Toshihiro Kouno <tkouno1 at md dot nsw dot co dot jp>
Date 2005-03-16 05:03:13 PST
Message Hi,

 I'm taking joy in using SC 0.8.0 on Win32 binaries.
It has became my best branch/merge friend.

 It's working very well in my Japanese environment. Thank
you for updating to 0.8.0.

 Now I met a confusion of the submerge. The sm shows a few
ghost differences at the end of files.

 I saw it at very limited situation only. It is strongly
depending on compared files. It seems a charset problem.

 I found it from the log view of the sc. I simplified the
situation for my analysis.

[Command]
smw.exe diff left.txt right.txt

[left.txt(symbolic)]
A
B
C

[right.txt(symbolic)]
A
D
B
C

[Expected Display(left/right)]
A/A
./D
B/B
C/C

[Confusion Display(left/right)]
A/A
./D
B/B
x/x
y/w
z/z
./b

 Here 'ABCD' mean some text lines. 'bxywz' mean parts of 'ABCD'.
'.' means empty. 'b' is a part of 'B'. 'xywz' are parts of 'C'.
'BC' have non-ascii characters. 'byw' are cut out from 'BC'
by ignoring line as unit.

 I retried after converting files to utf-8. The sc worked
well with "-e utf-8" at that case.

 If I replace non-ascii characters by ascii characters, I
don't meet this confusion.

 If I replace non-ascii characters by another non-ascii
characters, I meet similar confusion.

 If I remove 'D', I don't meet this confusion.

 If I edit 'A', 'bxywz' are changed. It seems that it
depends on the size of 'A'. In case of some special
periodic(?) sizes of 'A', I didn't meet this confusion.

 I prepared concrete left.txt and right.txt. Each file is
around 1,700 bytes with Japanese non-ascii characters.

 I'm able to send these files if you want.
---
Kouno

--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: dev-unsubscribe@subc​ommander.tigris.org
For additional commands, e-mail: dev-help@subcommande​r.tigris.org

« Previous message in topic | 1 of 5 | Next message in topic »

Messages

Show all messages in topic

Confused Display on submerge Toshihiro Kouno <tkouno1 at md dot nsw dot co dot jp> Toshihiro Kouno <tkouno1 at md dot nsw dot co dot jp> 2005-03-16 05:03:13 PST
     Re: Confused Display on submerge hauner Martin Hauner 2005-03-16 06:50:17 PST
         Re: Confused Display on submerge Toshihiro Kouno <tkouno1 at md dot nsw dot co dot jp> Toshihiro Kouno <tkouno1 at md dot nsw dot co dot jp> 2005-03-16 19:52:14 PST
             Re: Confused Display on submerge hauner Martin Hauner 2005-03-17 12:07:20 PST
                 Re: Confused Display on submerge hauner Martin Hauner 2005-03-18 06:00:26 PST
Messages per page: