DELTA 251881 2934195 12138
SVN ƒÇƒÈ	 ı ˆ ‚ÊpıoriginalENDREP
id: qm-251881.4-251886.r251895/68
type: file
pred: qm-251881.0.r251881/3943745
count: 1
text: 251895 0 34 58376 fac834b2bec65f4552c9db0f539c4f23 6b7ff4861b1f008e559856cbae67aaae8abfeba1 251894-5ed4/_6
props: 251881 3943629 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5
cpath: /head/contrib/subversion/subversion/libsvn_wc/merge.c
copyroot: 251886 /head/contrib/subversion

PLAIN
K 6
README
V 32
file pb-251881.0.r251881/3933935
K 13
adm_crawler.c
V 32
file pe-251881.0.r251881/3934298
K 11
adm_files.c
V 32
file pg-251881.0.r251881/3934731
K 11
adm_files.h
V 32
file pi-251881.0.r251881/3935161
K 9
adm_ops.c
V 32
file pk-251881.0.r251881/3935590
K 29
ambient_depth_filter_editor.c
V 32
file pm-251881.0.r251881/3936019
K 9
cleanup.c
V 32
file po-251881.0.r251881/3936467
K 11
conflicts.c
V 32
file pq-251881.0.r251881/3936894
K 11
conflicts.h
V 32
file ps-251881.0.r251881/3937326
K 9
context.c
V 32
file pu-251881.0.r251881/3937756
K 6
copy.c
V 32
file pw-251881.0.r251881/3938183
K 6
crop.c
V 32
file py-251881.0.r251881/3938608
K 8
delete.c
V 32
file q0-251881.0.r251881/3939033
K 12
deprecated.c
V 32
file q2-251881.0.r251881/3939460
K 6
diff.h
V 32
file q4-251881.0.r251881/3939893
K 13
diff_editor.c
V 32
file q6-251881.0.r251881/3940317
K 12
diff_local.c
V 32
file q8-251881.0.r251881/3940751
K 9
entries.c
V 32
file qa-251881.0.r251881/3941182
K 9
entries.h
V 32
file qc-251881.0.r251881/3941612
K 11
externals.c
V 32
file qe-251881.0.r251881/3942039
K 6
info.c
V 32
file qg-251881.0.r251881/3942470
K 6
lock.c
V 32
file qi-251881.0.r251881/3942895
K 6
lock.h
V 32
file qk-251881.0.r251881/3943321
K 7
merge.c
V 34
file qm-251881.4-251886.r251895/68
K 6
node.c
V 32
file qo-251881.0.r251881/3944172
K 16
old-and-busted.c
V 32
file qq-251881.0.r251881/3944597
K 7
props.c
V 32
file qs-251881.0.r251881/3945033
K 7
props.h
V 32
file qu-251881.0.r251881/3945460
K 11
questions.c
V 32
file qw-251881.0.r251881/3945885
K 10
relocate.c
V 32
file qy-251881.0.r251881/3946315
K 8
revert.c
V 32
file r0-251881.0.r251881/3946743
K 17
revision_status.c
V 32
file r2-251881.0.r251881/3947170
K 8
status.c
V 32
file r4-251881.0.r251881/3947604
K 11
token-map.h
V 32
file r6-251881.0.r251881/3948033
K 11
translate.c
V 32
file r8-251881.0.r251881/3948462
K 11
translate.h
V 32
file ra-251881.0.r251881/3948892
K 16
tree_conflicts.c
V 32
file rc-251881.0.r251881/3949321
K 16
tree_conflicts.h
V 32
file re-251881.0.r251881/3949756
K 15
update_editor.c
V 32
file rg-251881.0.r251881/3950190
K 9
upgrade.c
V 32
file ri-251881.0.r251881/3950626
K 6
util.c
V 32
file rk-251881.0.r251881/3951055
K 11
wc-checks.h
V 32
file rm-251881.0.r251881/3951480
K 13
wc-checks.sql
V 32
file ro-251881.0.r251881/3951792
K 13
wc-metadata.h
V 32
file rq-251881.0.r251881/3952162
K 15
wc-metadata.sql
V 32
file rs-251881.0.r251881/3952478
K 12
wc-queries.h
V 32
file ru-251881.0.r251881/3952851
K 14
wc-queries.sql
V 32
file rw-251881.0.r251881/3953168
K 4
wc.h
V 32
file ry-251881.0.r251881/3953541
K 7
wc_db.c
V 32
file s0-251881.0.r251881/3953964
K 7
wc_db.h
V 32
file s2-251881.0.r251881/3954392
K 16
wc_db_pristine.c
V 32
file s4-251881.0.r251881/3954820
K 15
wc_db_private.h
V 32
file s6-251881.0.r251881/3955255
K 19
wc_db_update_move.c
V 32
file s8-251881.0.r251881/3955689
K 12
wc_db_util.c
V 32
file sa-251881.0.r251881/3956129
K 14
wc_db_wcroot.c
V 32
file sc-251881.0.r251881/3956559
K 15
wcroot_anchor.c
V 32
file se-251881.0.r251881/3956992
K 11
workqueue.c
V 32
file sg-251881.0.r251881/3957425
K 11
workqueue.h
V 32
file si-251881.0.r251881/3957856
END
ENDREP
id: pa-251881.4-251886.r251895/3611
type: dir
pred: pa-251881.0.r251881/3961344
count: 1
text: 251895 434 3164 3164 d79848bfbe0e61c43ff07e458906ebef
cpath: /head/contrib/subversion/subversion/libsvn_wc
copyroot: 251886 /head/contrib/subversion

PLAIN
K 7
include
V 31
dir 1n-251881.0.r251881/3774886
K 25
libsvn_auth_gnome_keyring
V 31
dir 6e-251881.0.r251881/3776084
K 19
libsvn_auth_kwallet
V 31
dir 6k-251881.0.r251881/3777278
K 13
libsvn_client
V 31
dir 6q-251881.0.r251881/3799280
K 12
libsvn_delta
V 31
dir 9a-251881.0.r251881/3806806
K 11
libsvn_diff
V 31
dir a6-251881.0.r251881/3812782
K 9
libsvn_fs
V 31
dir aw-251881.0.r251881/3814906
K 14
libsvn_fs_base
V 31
dir b6-251881.0.r251881/3846261
K 12
libsvn_fs_fs
V 31
dir ew-251881.0.r251881/3856713
K 14
libsvn_fs_util
V 31
dir g6-251881.0.r251881/3857399
K 9
libsvn_ra
V 31
dir ga-251881.0.r251881/3862457
K 15
libsvn_ra_local
V 31
dir gw-251881.0.r251881/3864124
K 14
libsvn_ra_serf
V 31
dir h4-251881.0.r251881/3876316
K 13
libsvn_ra_svn
V 31
dir ik-251881.0.r251881/3881678
K 12
libsvn_repos
V 31
dir j8-251881.0.r251881/3890082
K 11
libsvn_subr
V 31
dir k8-251881.0.r251881/3933751
K 9
libsvn_wc
V 35
dir pa-251881.4-251886.r251895/3611
K 3
svn
V 31
dir sk-251881.0.r251881/3987674
K 23
svn_private_config.h.in
V 32
file vu-251881.0.r251881/3987966
K 21
svn_private_config.hw
V 32
file vw-251881.0.r251881/3988281
K 8
svnadmin
V 31
dir vy-251881.0.r251881/3989514
K 13
svndumpfilter
V 31
dir w4-251881.0.r251881/3990704
K 7
svnlook
V 31
dir wa-251881.0.r251881/3991861
K 7
svnmucc
V 31
dir wg-251881.0.r251881/3993012
K 8
svnrdump
V 31
dir wm-251881.0.r251881/3996100
K 8
svnserve
V 31
dir x0-251881.0.r251881/4000646
K 7
svnsync
V 31
dir xk-251881.0.r251881/4002741
K 10
svnversion
V 31
dir xu-251881.0.r251881/4003911
END
ENDREP
id: 1m-251881.4-251886.r251895/5406
type: dir
pred: 1m-251881.0.r251881/4005638
count: 1
text: 251895 3856 1537 1537 71050d6208fe4b439e20d1cf1a1b9695
cpath: /head/contrib/subversion/subversion
copyroot: 251886 /head/contrib/subversion

PLAIN
K 4
BUGS
V 31
file 5-251881.0.r251881/3725871
K 7
CHANGES
V 31
file 8-251881.0.r251881/3726084
K 10
COMMITTERS
V 31
file a-251881.0.r251881/3726308
K 7
INSTALL
V 31
file c-251881.0.r251881/3726535
K 7
LICENSE
V 31
file e-251881.0.r251881/3726760
K 11
Makefile.in
V 31
file g-251881.0.r251881/3727101
K 6
NOTICE
V 31
file i-251881.0.r251881/3727391
K 6
README
V 31
file k-251881.0.r251881/3727612
K 10
aclocal.m4
V 31
file m-251881.0.r251881/3727835
K 10
autogen.sh
V 31
file o-251881.0.r251881/3728203
K 16
build-outputs.mk
V 31
file q-251881.0.r251881/3728491
K 10
build.conf
V 31
file s-251881.0.r251881/3728843
K 9
configure
V 31
file u-251881.0.r251881/3729175
K 12
configure.ac
V 31
file w-251881.0.r251881/3729465
K 3
doc
V 30
dir y-251881.0.r251881/3732896
K 13
gen-make.opts
V 32
file 1g-251881.0.r251881/3733058
K 11
gen-make.py
V 32
file 1i-251881.0.r251881/3733428
K 11
get-deps.sh
V 32
file 1k-251881.0.r251881/3733862
K 10
subversion
V 35
dir 1m-251881.4-251886.r251895/5406
K 12
win-tests.py
V 32
file y0-251881.0.r251881/4005926
END
ENDREP
id: 3-251881.4-251886.r251895/6703
type: dir
pred: 3-251881.4-251886.r251886/34793
count: 2
text: 251895 5642 1048 1048 360e075786a5e80f3e870eb985ed31ef
cpath: /head/contrib/subversion
copyroot: 251886 /head/contrib/subversion

PLAIN
K 3
amd
V 27
dir 2-38495.0.r195626/11608
K 3
apr
V 35
dir 3-251875.0-251886.r251886/33933
K 8
apr-util
V 35
dir 3-251876.1-251886.r251886/34143
K 3
atf
V 34
dir 3-240116.0-240120.r251108/6758
K 5
bind9
V 27
dir 2-135447.0.r248788/6166
K 8
binutils
V 27
dir 2-33966.0.r251665/54481
K 5
bmake
V 34
dir 4-236769.0-241146.r251422/7270
K 5
bsnmp
V 27
dir 2-122395.0.r250380/1224
K 5
byacc
V 36
dir 7i-234949.0-235723.r251143/20741
K 5
bzip2
V 26
dir 2-78557.0.r240373/2310
K 7
com_err
V 26
dir 2-50765.0.r235716/4123
K 11
compiler-rt
V 34
dir 3-214150.0-215125.r245642/9813
K 6
dialog
V 28
dir 4-217309.0.r251843/50670
K 4
diff
V 26
dir 2-30840.0.r239360/3263
K 3
dtc
V 35
dir 3-204431.0-204488.r243933/54889
K 2
ee
V 35
dir 2-192830.0-192850.r245952/29686
K 5
expat
V 28
dir 2-104350.0.r247296/26427
K 4
file
V 27
dir 2-68350.0.r245307/16421
K 4
flex
V 32
dir 3-2258.0-250873.r250879/2249
K 3
gcc
V 27
dir 2-18335.0.r251212/78334
K 7
gcclibs
V 28
dir 2-169696.0.r250566/40789
K 3
gdb
V 27
dir 2-19371.0.r251858/30479
K 5
gdtoa
V 29
dir 2-112159.0.r243933/104490
K 5
gperf
V 28
dir 2-18215.0.r243933/106555
K 5
groff
V 26
dir 2-18100.0.r240833/7034
K 8
ipfilter
V 26
dir 2-22515.0.r246143/8758
K 8
jemalloc
V 28
dir 2-234370.0.r251300/22900
K 4
ldns
V 27
dir 2-246827.0.r249453/9768
K 4
less
V 26
dir 2-60787.0.r251170/4905
K 10
libarchive
V 35
dir 3-228753.0-228761.r248995/61956
K 10
libbegemot
V 27
dir 2-135769.0.r165010/1272
K 6
libc++
V 27
dir 3-227983.0.r251066/6396
K 12
libc-pwcache
V 34
dir 4-241233.0-241731.r241731/2403
K 8
libc-vis
V 34
dir 4-241236.0-244401.r248302/5595
K 8
libcxxrt
V 27
dir c-227983.0.r249993/2108
K 11
libgnuregex
V 28
dir 5-1.0-251436.r251437/829
K 7
libpcap
V 27
dir 2-17684.0.r251129/56959
K 11
libreadline
V 26
dir 2-21309.0.r173407/4492
K 9
libstdc++
V 27
dir 2-51921.0.r246314/50124
K 7
libyaml
V 34
dir 3-247738.0-247779.r247779/1661
K 4
llvm
V 35
dir 2-193323.0-208954.r251790/76675
K 9
lukemftpd
V 26
dir 2-79969.0.r223702/2578
K 6
mdocml
V 34
dir 3-241675.0-241754.r241775/4329
K 5
mknod
V 31
dir 4-244543.0-244562.r244562/0
K 5
mtree
V 34
dir 4-244541.1-244562.r249293/3481
K 7
ncurses
V 27
dir 2-50277.0.r235773/10951
K 6
netcat
V 26
dir 2-141262.0.r249520/806
K 5
ngatm
V 28
dir 2-121331.0.r208483/21574
K 3
ntp
V 28
dir 2-54360.0.r245952/183770
K 3
nvi
V 26
dir 2-19305.0.r250667/4968
K 4
ofed
V 29
dir 3-219820.0.r219820/404492
K 12
one-true-awk
V 26
dir 2-85588.0.r244988/3968
K 7
openbsm
V 27
dir 2-155132.0.r250926/5833
K 7
openpam
V 26
dir 2-91095.0.r249479/7999
K 10
openresolv
V 34
dir 3-219732.0-219736.r239477/1110
K 4
opie
V 26
dir 2-22348.0.r246873/2798
K 11
pam_modules
V 25
dir 2-93788.0.r94890/1725
K 2
pf
V 27
dir 2-126354.0.r240494/8826
K 7
pnpinfo
V 25
dir 2-29616.0.r228672/619
K 8
sendmail
V 26
dir 2-38033.0.r249730/1833
K 4
serf
V 35
dir 3-251877.2-251886.r251886/34363
K 5
smbfs
V 26
dir 2-87867.0.r250236/6787
K 7
sqlite3
V 35
dir 3-251883.3-251886.r251886/34575
K 10
subversion
V 34
dir 3-251881.4-251886.r251895/6703
K 12
tcp_wrappers
V 28
dir 2-44744.0.r243933/133405
K 7
tcpdump
V 27
dir 2-17681.0.r251210/15199
K 4
tcsh
V 28
dir 2-59244.0.r231990/161593
K 6
telnet
V 26
dir 2-29089.0.r251188/2183
K 7
texinfo
V 26
dir 2-21496.0.r221386/3537
K 5
tnftp
V 33
dir 2-79972.0-223308.r232779/5092
K 3
top
V 26
dir 2-24140.0.r244180/2277
K 10
traceroute
V 26
dir 2-18580.0.r237635/3403
K 6
tzcode
V 27
dir 2-204301.0.r228342/1407
K 6
tzdata
V 33
dir 2t-1639.0-204298.r249692/3288
K 7
unbound
V 28
dir 2-249140.0.r249141/35793
K 5
unvis
V 33
dir 6-247131.0-248303.r248303/331
K 3
vis
V 33
dir 7-247128.1-248303.r248303/544
K 3
wpa
V 34
dir 3-189251.0-189261.r251848/4161
K 2
xz
V 35
dir 3-207753.0-207842.r244601/13506
END
ENDREP
id: 1-16755.0.r251895/10629
type: dir
pred: 1-16755.0.r251886/38718
count: 4481
text: 251895 6931 3685 3685 db8f77782be62f7fb3309009680fff3f
cpath: /head/contrib
copyroot: 0 /
minfo-cnt: 52

PLAIN
K 9
COPYRIGHT
V 25
file 1-2656.0.r244900/131
K 5
LOCKS
V 26
file 1-146890.0.r244822/91
K 11
MAINTAINERS
V 25
file 1-94742.0.r250778/65
K 8
Makefile
V 30
file 3-1594.0-1595.r251750/294
K 13
Makefile.inc1
V 26
file 5-38666.0.r251765/822
K 17
ObsoleteFiles.inc
V 28
file 4-148330.0.r251825/5406
K 6
README
V 26
file 1-21173.0.r215293/415
K 8
UPDATING
V 27
file 1-41806.0.r251794/2737
K 3
bin
V 22
dir 1-5.0.r251763/5335
K 4
cddl
V 28
dir 1-168404.0.r251646/16378
K 7
contrib
V 27
dir 1-16755.0.r251895/10629
K 6
crypto
V 27
dir 1-25405.0.r251101/15537
K 3
etc
V 24
dir 1-38.0.r251885/12578
K 5
games
V 25
dir 1-2491.0.r248580/2553
K 3
gnu
V 23
dir 1-3.0.r251858/36869
K 7
include
V 24
dir 1-697.0.r251230/5376
K 9
kerberos5
V 27
dir 4q-29815.0.r250177/2948
K 3
lib
V 23
dir 6-5.0.r251894/11363
K 7
libexec
V 22
dir c-5.0.r251627/2403
K 7
release
V 24
dir 1-3027.0.r251811/998
K 6
rescue
V 26
dir 7-117035.0.r250626/885
K 4
sbin
V 23
dir fa-4.0.r251796/7308
K 6
secure
V 25
dir r-1553.0.r249971/3293
K 5
share
V 22
dir e-3.0.r251887/9596
K 3
sys
V 23
dir g-5.0.r251894/17266
K 5
tools
V 27
dir 43-1590.0.r251867/10409
K 7
usr.bin
V 23
dir m-3.0.r251886/78828
K 8
usr.sbin
V 23
dir q-3.0.r251854/13026
END
ENDREP
id: 5-1.0.r251895/12034
type: dir
pred: 5-1.0.r251894/18734
count: 175694
text: 251895 10820 1201 1201 840170f6ad43aa46dc1a4cca3798a7d6
props: 233713 14925 417 0 fe95f2ac252be6f08902a979c27a022c
cpath: /head
copyroot: 0 /
minfo-cnt: 127
minfo-here: y

PLAIN
K 11
ROADMAP.txt
V 27
file 0-179453.0.r221478/293
K 7
cvs2svn
V 23
dir 0-1.0.r177821/70859
K 4
head
V 23
dir 5-1.0.r251895/12034
K 8
projects
V 23
dir 6-1.0.r251777/30250
K 7
release
V 22
dir 7-1.0.r251259/2845
K 6
releng
V 22
dir 8-1.0.r251258/6561
K 6
stable
V 23
dir 9-1.0.r251893/18921
K 8
svnadmin
V 27
dir 0-179447.0.r251831/1402
K 4
user
V 22
dir a-1.0.r251870/4579
K 6
vendor
V 22
dir b-1.0.r251884/5500
K 13
vendor-crypto
V 25
dir 0-1575.0.r250738/3175
K 10
vendor-sys
V 27
dir 0-12116.0.r251644/67573
END
ENDREP
id: 0.0.r251895/12814
type: dir
pred: 0.0.r251894/19514
count: 251895
text: 251895 12286 515 515 7fcf1cf22abc5215bd02c0d121e20c04
cpath: /
copyroot: 0 /
minfo-cnt: 34989

qm-251881.4-251886.t251894-5ed4 modify-file true false /head/contrib/subversion/subversion/libsvn_wc/merge.c


12814 12985