diffi: diff improved a preview Gioele Barabucci - - PowerPoint PPT Presentation

DocEng 2018

2018-08-30, Halifax, NS, Canada

diffi: diff improved a preview

Gioele Barabucci

gioele.barabucci@uni-koeln.de University of Cologne, Cologne Center for eHumanities

$ e c h

• "

H e l l

• w
• r

l d ! " > f i l e . t x t $ g z i p

• c

f i l e . t x t > f i l e . t x t . g z

$ e c h

• "

H e l l

• w
• r

l d ! " > f i l e . t x t $ g z i p

• c

f i l e . t x t > f i l e . t x t . g z $ d i f f f i l e . t x t f i l e . t x t . g z B i n a r y f i l e s f i l e . t x t a n d f i l e . t x t . g z d i f f e r

$ e c h

• "

F e l i c i t à ! " > f i l e . u t f

• 8

$ i c

• n

v

• f

u t f

• 8
• t

u t f

• 1

6 \ < f i l e . u t f

• 8

> f i l e . u t f

• 1

6

$ e c h

• "

F e l i c i t à ! " > f i l e . u t f

• 8

$ i c

• n

v

• f

u t f

• 8
• t

u t f

• 1

6 \ < f i l e . u t f

• 8

> f i l e . u t f

• 1

6 $ d i f f f i l e . u t f

• 8

f i l e . u t f

• 1

6 B i n a r y f i l e s f i l e . u t f

• 8

a n d f i l e . u t f

• 1

6 d i f f e r

< r e c

• r

d c

• l
• r

= " r e d " v a l u e = " 1 " / >

< r e c

• r

d c

• l
• r

= " r e d " v a l u e = " 1 " / > < r e c

• r

d v a l u e = " 1 " c

• l
• r

= " r e d " / >

< r e c

• r

d c

• l
• r

= " r e d " v a l u e = " 1 " / > < r e c

• r

d v a l u e = " 1 " c

• l
• r

= " r e d " / > $ c m p r 1 . x m l r 2 . x m l r 1 . x m l r 2 . x m l d i f f e r : b y t e 9 , l i n e 1

diffi: diff improved

C MV + P Wh a t i s a d

• c

u m e n t ? L e v e l s

• f

a b s t r a c t i

• n
• f

c

• n

t e n t C

• m

p a r a b i l i t y , e q u a l i t y , e q u i v a l e n c e

U n i D M Wh a t a r e c h a n g e s ? D e l t a s ,

• p

e r a t i

• n

s C l a s s i f i c a t i

• n

: s i m p l e , c

• m

p l e x , m e a n i n g f u l c h a n g e s

E U P H

• w

t

• s

t

• r

e d e l t a s ? S e r i a l i z a t i

• n

f

• r

ma t f

• r

U n i D M d e l t a s . A m u l t i

• f
• r

m a t c

• m

p a r i s

• n

t

• l

t h a t c

• m

p a r e s c

• n

t e n t .

CMV+P document model

U n i c

• d

e O D T t a g s e t X ML

• D

O M X ML s e r i a l i z a t i

• n

U n i c

• d

e U T F

• 8

g z i p b i t s t r e a m b i t s t r e a m p a r a g r a p h s U n i c

• d

e H T ML t a g s e t H T ML S G ML

• l

i k e C P

• 1

2 5 2 r e p e r t

• i

r e C P

• 1

2 5 2 e n c

• d

i n g b i t s t r e a m p a r a g r a p h s

F

• r

e a c h l e v e l … C

• n

t e n t t y p e d e l e m e n t s Mo d e l s e t

• f

r u l e s , s t a t e s w h i c h k i n d

• f

c

• n

t e n t c a n b e s t

• r

e d V a r i a n t s e q u i v a l e n t p i e c e s

• f

c n t . ( f

• r

e q u i v a l e n c e )

O D T H T ML

CMV+P document model

c

• m

p a r a b l e s i m i l a r , b u t n

• t

c

• m

p a r a b l e U n i c

• d

e O D T t a g s e t X ML

• D

O M X ML s e r i a l i z a t i

• n

U n i c

• d

e U T F

• 8

g z i p b i t s t r e a m b i t s t r e a m p a r a g r a p h s U n i c

• d

e H T ML t a g s e t H T ML S G ML

• l

i k e C P

• 1

2 5 2 r e p e r t

• i

r e C P

• 1

2 5 2 e n c

• d

i n g b i t s t r e a m p a r a g r a p h s

O D T H T ML s e r i a l i z a t i

• n

d e s e r i a l i z a t i

• n

CMV+P document model

U n i c

• d

e O D T t a g s e t X ML

• D

O M X ML s e r i a l i z a t i

• n

U n i c

• d

e U T F

• 8

g z i p b i t s t r e a m b i t s t r e a m p a r a g r a p h s

O D T X H T ML

U n i c

• d

e H T ML t a g s e t X ML

• D

O M X ML s e r i a l i z a t i

• n

U n i c

• d

e U T F

• 1

6 b i t s t r e a m p a r a g r a p h s

F a x m a , J N D i f My e r s , Wu x x d i f x x d i f

Universal Delta Model

U n i c

• d

e O D T t a g s e t X ML

• D

O M X ML s e r i a l i z a t i

• n

U n i c

• d

e U T F

• 8

g z i p b i t s t r e a m b i t s t r e a m p a r a g r a p h s

O D T X H T ML

U n i c

• d

e H T ML t a g s e t X ML

• D

O M X ML s e r i a l i z a t i

• n

U n i c

• d

e U T F

• 1

6 b i t s t r e a m p a r a g r a p h s

• +

→ +

• +

♺ +

• U

n i D M t e l l s y

• u

h

• w

t

• d

e s c r i b e t h e c h a n g e s f

• u

n d b y a d i f a l g

• r

i t h m . V

• c

a b u l a r y f

• r

mo d e l

• s

p e c i f i c

• p

e r a t i

• n

s ,

• f

s e t s , I D s .

Extended Unified Patch format

• +

→ +

• +

♺ +

• f

i l e .

• d

t + + + f i l e . h t m l = = = p a r a g r a p h s / 4 . 2 1 = = = @ @

• 1

, 1 + 1 , 4 @ @ @ # I n t h e m i d d l e

• f

t h e s u m m e r . . . 1 #

• Á

l v a r

• !

, c r i e d h e r . . .

• 2

# T h e s u n w a s s h i n i n g f u r i

• u

s l y . . . 3 # P a r a g r a p h " Á l v a r

• !

, c r i e d # h e r . . . " m

• v

e d h e r e ; s p l i t i n t

• #

" Á l v a r

• !

" a n d " C r i e d h e r " * S p l i t ( M

• v

e ( 2 , 3 ) , 6 ) # N

• b
• d

y r e p l i e d . . . 4 = = = U n i c

• d

e / 1 . 3 = = = [ . . . ] @ @

• 1

3 , 2 @ @ @ # ( s p a c e ) 2 #

• <

C 1 > ( d e c

• m

p

• s

e d a s A + a c u t e )

• 4

1

diffi: diff improved

C

• m

p a r e t h e c

• n

t e n t a t m u l t i p l e l e v e l s

• f

a b s t r a c t i

• n

, n

• t

“ t h e f i l e ”

• P

l u g g a b l e d i f a l g

• r

i t h m s

• I

n t e n d e d a s a w

• r

k b e n c h f

• r

d e s i g n i n g d i f a l g

• s
• P

r e

• a

l p h a d e s i g n s t a t e

• I

n t e r e s t e d ? J

• i

n t h e d i f m a i l i n g l i s t a t h t t p s : / / d i f f p e d i a .

• r

g / f

• r

u m

Thank you

Gioele Barabucci gioele.barabucci@uni-koeln.de