On Thu, Jun 26, 2014 at 12:16:42AM +0200, Stefan Sperling wrote:
> On Wed, Jun 25, 2014 at 02:26:34PM -0700, Xin LI wrote:
> > Thanks for that. Is it possible to tell svn that the file have two
> > parents? e.g. it's derived from both contrib/file/ascmagic.c and
> > ^/vendor/file/dist/src/ascmagic.c? Or is that impossible with svn?
>
> Currently, SVN doesn't have such a concept.
Hi again,
I saw you comitted the merge in r267897 and that you chose the option
of having all copyfrom point to paths within ^/vendor. This might not
look like you had in mind originally. But I think it's fine this way
because it is consistent with earlier merges from the vendor branch.
I've tried a couple of ways of resolving these tree conflicts.
For reference, I'd like to share one way of resolving them which results
in a state that I believe more closely mirrors your original idea.
The script below runs the merge and then 'replays' moves in the
merge target if the move caused a tree conflict, and merges vendor
changes from the vendor branch into moved files.
So we end up with e.g. the src/ directory copyfrom pointing at
^/vendor/file/dist/src_at_267843, but copyfrom for e.g. ascmagic.c
points to its predecessor in head: ^/head/contrib/file/ascmagic.c_at_267877
so linear history for conflicted files is preserved.
Does this correspond to what you had in mind?
Below is the full merge script, and its output.
(Having to write merge scripts such as this really cries out for
more automation in SVN's conflict resolver...)
Script:
[[[
#!/bin/sh
set -e
set -x
rm -rf file-wc
svn checkout svn://svn.freebsd.org/base/head/contrib/file_at_267877 file-wc
cd file-wc
svn merge --accept postpone -c r267843 ^/vendor/file/dist .
# C Header
# > local file edit, incoming file delete or move upon merge
# moved to magic/Header
svn revert Header
svn rm magic/Header
svn mv Header magic/Header
svn merge --accept postpone -c 267877 ^/vendor/file/dist/magic/Header magic/Header
# C Localstuff
# > local file edit, incoming file delete or move upon merge
# moved to magic/Localstuff
svn revert Localstuff
svn rm magic/Localstuff
svn mv Localstuff magic/Localstuff
svn merge --accept postpone -c 267877 ^/vendor/file/dist/magic/Localstuff magic/Localstuff
# C Magdir
# > local dir edit, incoming dir delete or move upon merge
# moved to magic/Magdir
svn revert -R Magdir
svn rm magic/Magdir
svn mv Magdir magic/Magdir
svn merge --accept postpone ^/vendor/file/dist/Magdir_at_r267842 ^/vendor/file/dist/magic/Magdir_at_r267843 magic/Magdir
# this file has a text conflict after the merge, ensure that
# changes made in r267827 are used (security fix)
svn resolve --accept theirs-conflict magic/Magdir/commands
# C apprentice.c
# > local file edit, incoming file delete or move upon merge
# moved to src/apprentice.c
svn revert apprentice.c
svn rm src/apprentice.c
svn mv apprentice.c src/apprentice.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/apprentice.c src/apprentice.c
# C apptype.c
# > local file edit, incoming file delete or move upon merge
# moved to src/apptype.c
svn revert apptype.c
svn rm src/apptype.c
svn mv apptype.c src/apptype.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/apptype.c src/apptype.c
# C ascmagic.c
# > local file edit, incoming file delete or move upon merge
# moved to src/ascmagic.c
svn revert ascmagic.c
svn rm src/ascmagic.c
svn mv ascmagic.c src/ascmagic.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/ascmagic.c src/ascmagic.c
# C compress.c
# > local file edit, incoming file delete or move upon merge
# moved to src/compress.c
svn revert compress.c
svn rm src/compress.c
svn mv compress.c src/compress.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/compress.c src/compress.c
# C file.c
# > local file edit, incoming file delete or move upon merge
# moved to src/file.c
svn revert file.c
svn rm src/file.c
svn mv file.c src/file.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/file.c src/file.c
# C file.h
# > local file edit, incoming file delete or move upon merge
# moved to src/file.h
svn revert file.h
svn rm src/file.h
svn mv file.h src/file.h
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/file.h src/file.h
# C file.man
# > local file edit, incoming file delete or move upon merge
# moved to doc/file.man
svn revert file.man
svn rm doc/file.man
svn mv file.man doc/file.man
svn merge --accept postpone -c 267877 ^/vendor/file/dist/doc/file.man doc/file.man
# C file_opts.h
# > local file edit, incoming file delete or move upon merge
# moved to src/file_opts.h
svn revert file_opts.h
svn rm src/file_opts.h
svn mv file_opts.h src/file_opts.h
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/file_opts.h src/file_opts.h
# C fsmagic.c
# > local file edit, incoming file delete or move upon merge
# moved to src/fsmagic.c
svn revert fsmagic.c
svn rm src/fsmagic.c
svn mv fsmagic.c src/fsmagic.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/fsmagic.c src/fsmagic.c
# C funcs.c
# > local file edit, incoming file delete or move upon merge
# moved to src/funcs.c
svn revert funcs.c
svn rm src/funcs.c
svn mv funcs.c src/funcs.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/funcs.c src/funcs.c
# C is_tar.c
# > local file edit, incoming file delete or move upon merge
# moved to src/is_tar.c
svn revert is_tar.c
svn rm src/is_tar.c
svn mv is_tar.c src/is_tar.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/is_tar.c src/is_tar.c
# C libmagic.man
# > local file edit, incoming file delete or move upon merge
# moved to doc/libmagic.man
svn revert libmagic.man
svn rm doc/libmagic.man
svn mv libmagic.man doc/libmagic.man
svn merge --accept postpone -c 267877 ^/vendor/file/dist/doc/libmagic.man doc/libmagic.man
# C magic.c
# > local file edit, incoming file delete or move upon merge
# moved to src/magic.c
svn revert magic.c
svn rm src/magic.c
svn mv magic.c src/magic.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/magic.c src/magic.c
# C magic.h
# > local file edit, incoming file delete or move upon merge
# moved to src/magic.h
svn revert magic.h
svn rm src/magic.h
svn mv magic.h src/magic.h
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/magic.h src/magic.h
# C magic.man
# > local file edit, incoming file delete or move upon merge
# moved to doc/magic.man
svn revert magic.man
svn rm doc/magic.man
svn mv magic.man doc/magic.man
svn merge --accept postpone -c 267877 ^/vendor/file/dist/doc/magic.man doc/magic.man
# C mygetopt.h
# > local file edit, incoming file delete or move upon merge
# moved to src/mygetopt.h
svn revert mygetopt.h
svn rm src/mygetopt.h
svn mv mygetopt.h src/mygetopt.h
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/mygetopt.h src/mygetopt.h
# C print.c
# > local file edit, incoming file delete or move upon merge
# moved to src/print.c
svn revert print.c
svn rm src/print.c
svn mv print.c src/print.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/print.c src/print.c
# C readelf.c
# > local file edit, incoming file delete or move upon merge
# moved to src/readelf.c
svn revert readelf.c
svn rm src/readelf.c
svn mv readelf.c src/readelf.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/readelf.c src/readelf.c
# C readelf.h
# > local file edit, incoming file delete or move upon merge
# moved to src/readelf.h
svn revert readelf.h
svn rm src/readelf.h
svn mv readelf.h src/readelf.h
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/readelf.h src/readelf.h
# C softmagic.c
# > local file edit, incoming file delete or move upon merge
# moved to src/softmagic.c
svn revert softmagic.c
svn rm src/softmagic.c
svn mv softmagic.c src/softmagic.c
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/softmagic.c src/softmagic.c
# C tar.h
# > local file edit, incoming file delete or move upon merge
# moved to src/tar.h
svn revert tar.h
svn rm src/tar.h
svn mv tar.h src/tar.h
svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/tar.h src/tar.h
svn status
svn info src | grep ^Copied
svn info src/ascmagic.c | grep ^Copied
]]]
Output:
+ rm -rf file-wc
+ svn checkout svn://svn.freebsd.org/base/head/contrib/file_at_267877 file-wc
A file-wc/strlcpy.c
A file-wc/elfclass.h
A file-wc/ChangeLog
A file-wc/file.man
A file-wc/names.h
A file-wc/README
A file-wc/softmagic.c
A file-wc/strlcat.c
A file-wc/vasprintf.c
A file-wc/funcs.c
A file-wc/file.c
A file-wc/config.h.in
A file-wc/Localstuff
A file-wc/getopt_long.c
A file-wc/is_tar.c
A file-wc/Magdir
A file-wc/Magdir/ibm6000
A file-wc/Magdir/luks
A file-wc/Magdir/animation
A file-wc/Magdir/netbsd
A file-wc/Magdir/sketch
A file-wc/Magdir/sequent
A file-wc/Magdir/ocaml
A file-wc/Magdir/sccs
A file-wc/Magdir/rtf
A file-wc/Magdir/gcc
A file-wc/Magdir/c64
A file-wc/Magdir/sniffer
A file-wc/Magdir/mail.news
A file-wc/Magdir/revision
A file-wc/Magdir/clipper
A file-wc/Magdir/chord
A file-wc/Magdir/audio
A file-wc/Magdir/vorbis
A file-wc/Magdir/parrot
A file-wc/Magdir/llvm
A file-wc/Magdir/lif
A file-wc/Magdir/freebsd
A file-wc/Magdir/varied.script
A file-wc/Magdir/mathematica
A file-wc/Magdir/mcrypt
A file-wc/Magdir/lecter
A file-wc/Magdir/ole2compounddocs
A file-wc/Magdir/ruby
A file-wc/Magdir/xwindows
A file-wc/Magdir/mercurial
A file-wc/Magdir/rinex
A file-wc/Magdir/msdos
A file-wc/Magdir/macintosh
A file-wc/Magdir/jpeg
A file-wc/Magdir/selinux
A file-wc/Magdir/tgif
A file-wc/Magdir/pkgadd
A file-wc/Magdir/frame
A file-wc/Magdir/timezone
A file-wc/Magdir/xenix
A file-wc/Magdir/applix
A file-wc/Magdir/ssh
A file-wc/Magdir/typeset
A file-wc/Magdir/unknown
A file-wc/Magdir/linux
A file-wc/Magdir/ssl
A file-wc/Magdir/convex
A file-wc/Magdir/console
A file-wc/Magdir/acorn
A file-wc/Magdir/kde
A file-wc/Magdir/images
A file-wc/Magdir/vms
A file-wc/Magdir/dump
A file-wc/Magdir/hp
A file-wc/Magdir/filesystems
A file-wc/Magdir/mozilla
A file-wc/Magdir/tuxedo
A file-wc/Magdir/mach
A file-wc/Magdir/diff
A file-wc/Magdir/msvc
A file-wc/Magdir/cups
A file-wc/Magdir/fortran
A file-wc/Magdir/apl
A file-wc/Magdir/news
A file-wc/Magdir/claris
A file-wc/Magdir/make
A file-wc/Magdir/pbm
A file-wc/Magdir/scientific
A file-wc/Magdir/olf
A file-wc/Magdir/amigaos
A file-wc/Magdir/magic
A file-wc/Magdir/marc21
A file-wc/Magdir/allegro
A file-wc/Magdir/virtual
A file-wc/Magdir/clarion
A file-wc/Magdir/ispell
A file-wc/Magdir/fonts
A file-wc/Magdir/inform
A file-wc/Magdir/windows
A file-wc/Magdir/games
A file-wc/Magdir/gimp
A file-wc/Magdir/cddb
A file-wc/Magdir/sendmail
A file-wc/Magdir/mathcad
A file-wc/Magdir/modem
A file-wc/Magdir/zfs
A file-wc/Magdir/netscape
A file-wc/Magdir/perl
A file-wc/Magdir/sgml
A file-wc/Magdir/pulsar
A file-wc/Magdir/project
A file-wc/Magdir/geo
A file-wc/Magdir/cracklib
A file-wc/Magdir/virtutech
A file-wc/Magdir/oasis
A file-wc/Magdir/asterix
A file-wc/Magdir/varied.out
A file-wc/Magdir/python
A file-wc/Magdir/hitachi-sh
A file-wc/Magdir/grace
A file-wc/Magdir/matroska
A file-wc/Magdir/tcl
A file-wc/Magdir/kml
A file-wc/Magdir/mmdf
A file-wc/Magdir/softquad
A file-wc/Magdir/compress
A file-wc/Magdir/database
A file-wc/Magdir/sinclair
A file-wc/Magdir/sun
A file-wc/Magdir/pdf
A file-wc/Magdir/editors
A file-wc/Magdir/citrus
A file-wc/Magdir/dolby
A file-wc/Magdir/blender
A file-wc/Magdir/xilinx
A file-wc/Magdir/fusecompress
A file-wc/Magdir/java
A file-wc/Magdir/pdp
A file-wc/Magdir/mkid
A file-wc/Magdir/unicode
A file-wc/Magdir/epoc
A file-wc/Magdir/riff
A file-wc/Magdir/mime
A file-wc/Magdir/bflt
A file-wc/Magdir/communications
A file-wc/Magdir/psdbms
A file-wc/Magdir/gnu
A file-wc/Magdir/palm
A file-wc/Magdir/spec
A file-wc/Magdir/karma
A file-wc/Magdir/geos
A file-wc/Magdir/rpm
A file-wc/Magdir/cisco
A file-wc/Magdir/sharc
A file-wc/Magdir/apple
A file-wc/Magdir/pyramid
A file-wc/Magdir/sc
A file-wc/Magdir/os400
A file-wc/Magdir/uuencode
A file-wc/Magdir/cafebabe
A file-wc/Magdir/plus5
A file-wc/Magdir/vxl
A file-wc/Magdir/diamond
A file-wc/Magdir/encore
A file-wc/Magdir/assembler
A file-wc/Magdir/natinst
A file-wc/Magdir/m4
A file-wc/Magdir/archive
A file-wc/Magdir/lua
A file-wc/Magdir/sgi
A file-wc/Magdir/terminfo
A file-wc/Magdir/sisu
A file-wc/Magdir/parix
A file-wc/Magdir/btsnoop
A file-wc/Magdir/smalltalk
A file-wc/Magdir/lex
A file-wc/Magdir/nitpicker
A file-wc/Magdir/blit
A file-wc/Magdir/motorola
A file-wc/Magdir/teapot
A file-wc/Magdir/adi
A file-wc/Magdir/flash
A file-wc/Magdir/msooxml
A file-wc/Magdir/vax
A file-wc/Magdir/wordprocessors
A file-wc/Magdir/tex
A file-wc/Magdir/human68k
A file-wc/Magdir/ctags
A file-wc/Magdir/esri
A file-wc/Magdir/guile
A file-wc/Magdir/isz
A file-wc/Magdir/elf
A file-wc/Magdir/osf1
A file-wc/Magdir/securitycerts
A file-wc/Magdir/wsdl
A file-wc/Magdir/gnumeric
A file-wc/Magdir/smile
A file-wc/Magdir/zyxel
A file-wc/Magdir/misctools
A file-wc/Magdir/att3b
A file-wc/Magdir/digital
A file-wc/Magdir/ebml
A file-wc/Magdir/mlssa
A file-wc/Magdir/gringotts
A file-wc/Magdir/bsdi
A file-wc/Magdir/amanda
A file-wc/Magdir/octave
A file-wc/Magdir/xdelta
A file-wc/Magdir/alliant
A file-wc/Magdir/weak
A file-wc/Magdir/cad
A file-wc/Magdir/visx
A file-wc/Magdir/wireless
A file-wc/Magdir/dyadic
A file-wc/Magdir/commands
A file-wc/Magdir/basis
A file-wc/Magdir/ibm370
A file-wc/Magdir/vmware
A file-wc/Magdir/metastore
A file-wc/Magdir/pascal
A file-wc/Magdir/vicar
A file-wc/Magdir/mirage
A file-wc/Magdir/ti-8x
A file-wc/Magdir/dact
A file-wc/Magdir/gnome-keyring
A file-wc/Magdir/fcs
A file-wc/Magdir/bsi
A file-wc/Magdir/music
A file-wc/Magdir/troff
A file-wc/Magdir/blcr
A file-wc/Magdir/ncr
A file-wc/Magdir/plan9
A file-wc/Magdir/printer
A file-wc/Magdir/zilog
A file-wc/Magdir/pgp
A file-wc/Magdir/graphviz
A file-wc/Magdir/warc
A file-wc/Magdir/adventure
A file-wc/Magdir/maple
A file-wc/Magdir/fsav
A file-wc/Magdir/sql
A file-wc/Magdir/c-lang
A file-wc/Magdir/xo65
A file-wc/Magdir/mup
A file-wc/Magdir/spectrum
A file-wc/Magdir/efi
A file-wc/Magdir/os2
A file-wc/Magdir/iff
A file-wc/Magdir/netware
A file-wc/Magdir/lisp
A file-wc/Magdir/erlang
A file-wc/Magdir/mips
A file-wc/Magdir/interleaf
A file-wc/Magdir/bout
A file-wc/Magdir/island
A file-wc/Magdir/os9
A file-wc/Magdir/sysex
A file-wc/Magdir/intel
A file-wc/file.h
A file-wc/TODO
A file-wc/acinclude.m4
A file-wc/asprintf.c
A file-wc/readcdf.c
A file-wc/Makefile.am
A file-wc/magic2mime
A file-wc/file_opts.h
A file-wc/tar.h
A file-wc/print.c
A file-wc/aclocal.m4
A file-wc/cdf.c
A file-wc/install-sh
A file-wc/libmagic.man
A file-wc/configure
A file-wc/Makefile.in
A file-wc/cdf.h
A file-wc/readelf.c
A file-wc/AUTHORS
A file-wc/ascmagic.c
A file-wc/compile
A file-wc/Header
A file-wc/readelf.h
A file-wc/fsmagic.c
A file-wc/magic.man
A file-wc/cdf_time.c
A file-wc/Makefile.am-src
A file-wc/mygetopt.h
A file-wc/magic.c
A file-wc/tests
A file-wc/tests/test.c
A file-wc/tests/Makefile.in
A file-wc/tests/Makefile.am
A file-wc/tests/gedcom.result
A file-wc/tests/gedcom.testfile
A file-wc/tests/README
A file-wc/tests/gedcom.magic
A file-wc/configure.ac
A file-wc/apptype.c
A file-wc/INSTALL
A file-wc/magic.h
A file-wc/encoding.c
A file-wc/COPYING
A file-wc/MAINT
A file-wc/getline.c
A file-wc/apprentice.c
A file-wc/compress.c
A file-wc/NEWS
U file-wc
Checked out revision 267877.
+ cd file-wc
+ svn merge --accept postpone -c r267843 ^/vendor/file/dist .
--- Merging r267843 into '.':
C libmagic.man
C readelf.c
C ascmagic.c
C Header
C readelf.h
C fsmagic.c
C magic.man
C mygetopt.h
C magic.c
C apptype.c
C magic.h
C apprentice.c
C compress.c
C file.man
C softmagic.c
C funcs.c
C file.c
C Localstuff
C is_tar.c
C Magdir
C file.h
C file_opts.h
C tar.h
C print.c
U ChangeLog
A depcomp
A src
A src/strcasestr.c
A src/strlcpy.c
A src/asctime_r.c
A src/ascmagic.c
A src/cdf_time.c
A src/softmagic.c
A src/strlcat.c
A src/vasprintf.c
A src/mygetopt.h
A src/funcs.c
A src/getopt_long.c
A src/ctime_r.c
A src/encoding.c
A src/readcdf.c
A src/Makefile.am
A src/file_opts.h
A src/magic.h.in
A src/apprentice.c
A src/tar.h
A src/pread.c
A src/compress.c
A src/cdf.c
A src/print.c
A src/cdf.h
A src/Makefile.in
A src/elfclass.h
A src/readelf.c
A src/readelf.h
A src/fsmagic.c
A src/file.c
A src/magic.c
A src/is_tar.c
A src/apptype.c
A src/fmtcheck.c
A src/file.h
A src/magic.h
A src/asprintf.c
A src/getline.c
U compile
A config.guess
A ltmain.sh
U README
A config.sub
U config.h.in
U tests/Makefile.in
A tests/escapevel.result
A tests/escapevel.testfile
A tests/issue311docx.result
U tests/Makefile.am
A tests/issue311docx.testfile
U tests/gedcom.result
U tests/README
D tests/gedcom.magic
U configure.ac
A doc
A doc/Makefile.in
A doc/Makefile.am
A doc/file.man
A doc/magic.man
A doc/libmagic.man
U TODO
A missing
U Makefile.am
U aclocal.m4
U install-sh
A m4
A m4/lt~obsolete.m4
A m4/ltoptions.m4
A m4/ltsugar.m4
A m4/libtool.m4
A m4/ltversion.m4
A magic
A magic/Header
A magic/Makefile.am
A magic/Localstuff
A magic/Makefile.in
A magic/Magdir
A magic/Magdir/commands
A magic/Magdir/perl
A magic/Magdir/console
A magic/Magdir/msx
A magic/Magdir/intel
A magic/Magdir/encore
A magic/Magdir/fortran
A magic/Magdir/android
A magic/Magdir/clarion
A magic/Magdir/gpt
A magic/Magdir/teapot
A magic/Magdir/macos
A magic/Magdir/javascript
A magic/Magdir/fcs
A magic/Magdir/varied.script
A magic/Magdir/scientific
A magic/Magdir/amanda
A magic/Magdir/octave
A magic/Magdir/ncr
A magic/Magdir/epoc
A magic/Magdir/riff
A magic/Magdir/bflt
A magic/Magdir/palm
A magic/Magdir/frame
A magic/Magdir/spec
A magic/Magdir/dyadic
A magic/Magdir/geos
A magic/Magdir/revision
A magic/Magdir/linux
A magic/Magdir/vmware
A magic/Magdir/mup
A magic/Magdir/acorn
A magic/Magdir/efi
A magic/Magdir/os2
A magic/Magdir/os9
A magic/Magdir/magic
A magic/Magdir/varied.out
A magic/Magdir/gringotts
A magic/Magdir/hitachi-sh
A magic/Magdir/xwindows
A magic/Magdir/sisu
A magic/Magdir/games
A magic/Magdir/neko
A magic/Magdir/gcc
A magic/Magdir/modem
A magic/Magdir/pyramid
A magic/Magdir/wsdl
A magic/Magdir/island
A magic/Magdir/lif
A magic/Magdir/diamond
A magic/Magdir/mathematica
A magic/Magdir/oasis
A magic/Magdir/netbsd
A magic/Magdir/ebml
A magic/Magdir/archive
A magic/Magdir/bsdi
A magic/Magdir/pwsafe
A magic/Magdir/weak
A magic/Magdir/sendmail
A magic/Magdir/netscape
A magic/Magdir/vorbis
A magic/Magdir/sc
A magic/Magdir/parrot
A magic/Magdir/pbf
A magic/Magdir/dact
A magic/Magdir/symbos
A magic/Magdir/cubemap
A magic/Magdir/apl
A magic/Magdir/pbm
A magic/Magdir/matroska
A magic/Magdir/blcr
A magic/Magdir/alliant
A magic/Magdir/softquad
A magic/Magdir/karma
A magic/Magdir/cisco
A magic/Magdir/apple
A magic/Magdir/sinclair
A magic/Magdir/tuxedo
A magic/Magdir/plus5
A magic/Magdir/geo
A magic/Magdir/claris
A magic/Magdir/parix
A magic/Magdir/kml
A magic/Magdir/marc21
A magic/Magdir/ispell
A magic/Magdir/sccs
A magic/Magdir/flash
A magic/Magdir/ctags
A magic/Magdir/gnome
A magic/Magdir/pulsar
A magic/Magdir/uuencode
A magic/Magdir/smile
A magic/Magdir/pdf
A magic/Magdir/llvm
A magic/Magdir/ibm6000
A magic/Magdir/mlssa
A magic/Magdir/python
A magic/Magdir/ruby
A magic/Magdir/pdp
A magic/Magdir/jpeg
A magic/Magdir/tgif
A magic/Magdir/sniffer
A magic/Magdir/icc
A magic/Magdir/rpm
A magic/Magdir/dump
A magic/Magdir/msvc
A magic/Magdir/diff
A magic/Magdir/gnumeric
A magic/Magdir/vxl
A magic/Magdir/cups
A magic/Magdir/xilinx
A magic/Magdir/virtutech
A magic/Magdir/make
A magic/Magdir/music
A magic/Magdir/plan9
A magic/Magdir/communications
A magic/Magdir/cddb
A magic/Magdir/gimp
A magic/Magdir/adi
A magic/Magdir/typeset
A magic/Magdir/maple
A magic/Magdir/unknown
A magic/Magdir/sgml
A magic/Magdir/isz
A magic/Magdir/elf
A magic/Magdir/mozilla
A magic/Magdir/sysex
A magic/Magdir/amigaos
A magic/Magdir/mmdf
A magic/Magdir/allegro
A magic/Magdir/virtual
A magic/Magdir/cad
A magic/Magdir/uterus
A magic/Magdir/graphviz
A magic/Magdir/windows
A magic/Magdir/ocaml
A magic/Magdir/wordprocessors
A magic/Magdir/chord
A magic/Magdir/mathcad
A magic/Magdir/audio
A magic/Magdir/spectrum
A magic/Magdir/project
A magic/Magdir/hp
A magic/Magdir/pgf
A magic/Magdir/assembler
A magic/Magdir/bsi
A magic/Magdir/fusecompress
A magic/Magdir/asterix
A magic/Magdir/java
A magic/Magdir/xdelta
A magic/Magdir/smalltalk
A magic/Magdir/mkid
A magic/Magdir/rinex
A magic/Magdir/msdos
A magic/Magdir/pgp
A magic/Magdir/mime
A magic/Magdir/nitpicker
A magic/Magdir/xenix
A magic/Magdir/sql
A magic/Magdir/ibm370
A magic/Magdir/pascal
A magic/Magdir/iff
A magic/Magdir/mirage
A magic/Magdir/aout
A magic/Magdir/editors
A magic/Magdir/blender
A magic/Magdir/sereal
A magic/Magdir/misctools
A magic/Magdir/ole2compounddocs
A magic/Magdir/blackberry
A magic/Magdir/unicode
A magic/Magdir/fonts
A magic/Magdir/blit
A magic/Magdir/timezone
A magic/Magdir/rtf
A magic/Magdir/c64
A magic/Magdir/c-lang
A magic/Magdir/esri
A magic/Magdir/metastore
A magic/Magdir/osf1
A magic/Magdir/erlang
A magic/Magdir/natinst
A magic/Magdir/grace
A magic/Magdir/sketch
A magic/Magdir/btsnoop
A magic/Magdir/visx
A magic/Magdir/keepass
A magic/Magdir/ssh
A magic/Magdir/adventure
A magic/Magdir/msooxml
A magic/Magdir/ssl
A magic/Magdir/kde
A magic/Magdir/vms
A magic/Magdir/filesystems
A magic/Magdir/dolby
A magic/Magdir/interleaf
A magic/Magdir/cracklib
A magic/Magdir/ctf
A magic/Magdir/digital
A magic/Magdir/mcrypt
A magic/Magdir/lecter
A magic/Magdir/animation
A magic/Magdir/m4
A magic/Magdir/olf
A magic/Magdir/pkgadd
A magic/Magdir/compress
A magic/Magdir/warc
A magic/Magdir/applix
A magic/Magdir/mail.news
A magic/Magdir/fsav
A magic/Magdir/sharc
A magic/Magdir/xo65
A magic/Magdir/zfs
A magic/Magdir/convex
A magic/Magdir/database
A magic/Magdir/os400
A magic/Magdir/images
A magic/Magdir/lisp
A magic/Magdir/mips
A magic/Magdir/bout
A magic/Magdir/map
A magic/Magdir/luks
A magic/Magdir/tcl
A magic/Magdir/mercurial
A magic/Magdir/printer
A magic/Magdir/macintosh
A magic/Magdir/inform
A magic/Magdir/sun
A magic/Magdir/guile
A magic/Magdir/netware
A magic/Magdir/securitycerts
A magic/Magdir/cafebabe
A magic/Magdir/zyxel
A magic/Magdir/att3b
A magic/Magdir/terminfo
A magic/Magdir/sequent
A magic/Magdir/gnu
A magic/Magdir/motorola
A magic/Magdir/clipper
A magic/Magdir/basis
A magic/Magdir/human68k
A magic/Magdir/vicar
A magic/Magdir/mach
A magic/Magdir/ti-8x
A magic/Magdir/citrus
A magic/Magdir/freebsd
A magic/Magdir/news
A magic/Magdir/troff
A magic/Magdir/lua
A magic/Magdir/sgi
A magic/Magdir/zilog
A magic/Magdir/selinux
A magic/Magdir/psdbms
A magic/Magdir/lex
A magic/Magdir/wireless
A magic/Magdir/vax
A magic/Magdir/tex
U configure
A python
A python/magic.py
A python/setup.py
A python/Makefile.am
A python/README
A python/Makefile.in
A python/example.py
U Makefile.in
D getline.c
D readcdf.c
D cdf_time.c
D strlcat.c
D vasprintf.c
D cdf.c
D Makefile.am-src
D strlcpy.c
D cdf.h
D elfclass.h
D getopt_long.c
D encoding.c
D asprintf.c
--- Recording mergeinfo for merge of r267843 into '.':
U .
Summary of conflicts:
Tree conflicts: 24
+ svn revert Header
+ svn rm magic/Header
D magic/Header
+ svn mv Header magic/Header
A magic/Header
D Header
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/magic/Header magic/Header
--- Recording mergeinfo for merge of r267877 into 'magic/Header':
G magic/Header
+ svn revert Localstuff
+ svn rm magic/Localstuff
D magic/Localstuff
+ svn mv Localstuff magic/Localstuff
A magic/Localstuff
D Localstuff
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/magic/Localstuff magic/Localstuff
--- Recording mergeinfo for merge of r267877 into 'magic/Localstuff':
G magic/Localstuff
+ svn revert -R Magdir
+ svn rm magic/Magdir
D magic/Magdir
D magic/Magdir/acorn
D magic/Magdir/adi
D magic/Magdir/adventure
D magic/Magdir/allegro
D magic/Magdir/alliant
D magic/Magdir/amanda
D magic/Magdir/amigaos
D magic/Magdir/android
D magic/Magdir/animation
D magic/Magdir/aout
D magic/Magdir/apl
D magic/Magdir/apple
D magic/Magdir/applix
D magic/Magdir/archive
D magic/Magdir/assembler
D magic/Magdir/asterix
D magic/Magdir/att3b
D magic/Magdir/audio
D magic/Magdir/basis
D magic/Magdir/bflt
D magic/Magdir/blackberry
D magic/Magdir/blcr
D magic/Magdir/blender
D magic/Magdir/blit
D magic/Magdir/bout
D magic/Magdir/bsdi
D magic/Magdir/bsi
D magic/Magdir/btsnoop
D magic/Magdir/c-lang
D magic/Magdir/c64
D magic/Magdir/cad
D magic/Magdir/cafebabe
D magic/Magdir/cddb
D magic/Magdir/chord
D magic/Magdir/cisco
D magic/Magdir/citrus
D magic/Magdir/clarion
D magic/Magdir/claris
D magic/Magdir/clipper
D magic/Magdir/commands
D magic/Magdir/communications
D magic/Magdir/compress
D magic/Magdir/console
D magic/Magdir/convex
D magic/Magdir/cracklib
D magic/Magdir/ctags
D magic/Magdir/ctf
D magic/Magdir/cubemap
D magic/Magdir/cups
D magic/Magdir/dact
D magic/Magdir/database
D magic/Magdir/diamond
D magic/Magdir/diff
D magic/Magdir/digital
D magic/Magdir/dolby
D magic/Magdir/dump
D magic/Magdir/dyadic
D magic/Magdir/ebml
D magic/Magdir/editors
D magic/Magdir/efi
D magic/Magdir/elf
D magic/Magdir/encore
D magic/Magdir/epoc
D magic/Magdir/erlang
D magic/Magdir/esri
D magic/Magdir/fcs
D magic/Magdir/filesystems
D magic/Magdir/flash
D magic/Magdir/fonts
D magic/Magdir/fortran
D magic/Magdir/frame
D magic/Magdir/freebsd
D magic/Magdir/fsav
D magic/Magdir/fusecompress
D magic/Magdir/games
D magic/Magdir/gcc
D magic/Magdir/geo
D magic/Magdir/geos
D magic/Magdir/gimp
D magic/Magdir/gnome
D magic/Magdir/gnu
D magic/Magdir/gnumeric
D magic/Magdir/gpt
D magic/Magdir/grace
D magic/Magdir/graphviz
D magic/Magdir/gringotts
D magic/Magdir/guile
D magic/Magdir/hitachi-sh
D magic/Magdir/hp
D magic/Magdir/human68k
D magic/Magdir/ibm370
D magic/Magdir/ibm6000
D magic/Magdir/icc
D magic/Magdir/iff
D magic/Magdir/images
D magic/Magdir/inform
D magic/Magdir/intel
D magic/Magdir/interleaf
D magic/Magdir/island
D magic/Magdir/ispell
D magic/Magdir/isz
D magic/Magdir/java
D magic/Magdir/javascript
D magic/Magdir/jpeg
D magic/Magdir/karma
D magic/Magdir/kde
D magic/Magdir/keepass
D magic/Magdir/kml
D magic/Magdir/lecter
D magic/Magdir/lex
D magic/Magdir/lif
D magic/Magdir/linux
D magic/Magdir/lisp
D magic/Magdir/llvm
D magic/Magdir/lua
D magic/Magdir/luks
D magic/Magdir/m4
D magic/Magdir/mach
D magic/Magdir/macintosh
D magic/Magdir/macos
D magic/Magdir/magic
D magic/Magdir/mail.news
D magic/Magdir/make
D magic/Magdir/map
D magic/Magdir/maple
D magic/Magdir/marc21
D magic/Magdir/mathcad
D magic/Magdir/mathematica
D magic/Magdir/matroska
D magic/Magdir/mcrypt
D magic/Magdir/mercurial
D magic/Magdir/metastore
D magic/Magdir/mime
D magic/Magdir/mips
D magic/Magdir/mirage
D magic/Magdir/misctools
D magic/Magdir/mkid
D magic/Magdir/mlssa
D magic/Magdir/mmdf
D magic/Magdir/modem
D magic/Magdir/motorola
D magic/Magdir/mozilla
D magic/Magdir/msdos
D magic/Magdir/msooxml
D magic/Magdir/msvc
D magic/Magdir/msx
D magic/Magdir/mup
D magic/Magdir/music
D magic/Magdir/natinst
D magic/Magdir/ncr
D magic/Magdir/neko
D magic/Magdir/netbsd
D magic/Magdir/netscape
D magic/Magdir/netware
D magic/Magdir/news
D magic/Magdir/nitpicker
D magic/Magdir/oasis
D magic/Magdir/ocaml
D magic/Magdir/octave
D magic/Magdir/ole2compounddocs
D magic/Magdir/olf
D magic/Magdir/os2
D magic/Magdir/os400
D magic/Magdir/os9
D magic/Magdir/osf1
D magic/Magdir/palm
D magic/Magdir/parix
D magic/Magdir/parrot
D magic/Magdir/pascal
D magic/Magdir/pbf
D magic/Magdir/pbm
D magic/Magdir/pdf
D magic/Magdir/pdp
D magic/Magdir/perl
D magic/Magdir/pgf
D magic/Magdir/pgp
D magic/Magdir/pkgadd
D magic/Magdir/plan9
D magic/Magdir/plus5
D magic/Magdir/printer
D magic/Magdir/project
D magic/Magdir/psdbms
D magic/Magdir/pulsar
D magic/Magdir/pwsafe
D magic/Magdir/pyramid
D magic/Magdir/python
D magic/Magdir/revision
D magic/Magdir/riff
D magic/Magdir/rinex
D magic/Magdir/rpm
D magic/Magdir/rtf
D magic/Magdir/ruby
D magic/Magdir/sc
D magic/Magdir/sccs
D magic/Magdir/scientific
D magic/Magdir/securitycerts
D magic/Magdir/selinux
D magic/Magdir/sendmail
D magic/Magdir/sequent
D magic/Magdir/sereal
D magic/Magdir/sgi
D magic/Magdir/sgml
D magic/Magdir/sharc
D magic/Magdir/sinclair
D magic/Magdir/sisu
D magic/Magdir/sketch
D magic/Magdir/smalltalk
D magic/Magdir/smile
D magic/Magdir/sniffer
D magic/Magdir/softquad
D magic/Magdir/spec
D magic/Magdir/spectrum
D magic/Magdir/sql
D magic/Magdir/ssh
D magic/Magdir/ssl
D magic/Magdir/sun
D magic/Magdir/symbos
D magic/Magdir/sysex
D magic/Magdir/tcl
D magic/Magdir/teapot
D magic/Magdir/terminfo
D magic/Magdir/tex
D magic/Magdir/tgif
D magic/Magdir/ti-8x
D magic/Magdir/timezone
D magic/Magdir/troff
D magic/Magdir/tuxedo
D magic/Magdir/typeset
D magic/Magdir/unicode
D magic/Magdir/unknown
D magic/Magdir/uterus
D magic/Magdir/uuencode
D magic/Magdir/varied.out
D magic/Magdir/varied.script
D magic/Magdir/vax
D magic/Magdir/vicar
D magic/Magdir/virtual
D magic/Magdir/virtutech
D magic/Magdir/visx
D magic/Magdir/vms
D magic/Magdir/vmware
D magic/Magdir/vorbis
D magic/Magdir/vxl
D magic/Magdir/warc
D magic/Magdir/weak
D magic/Magdir/windows
D magic/Magdir/wireless
D magic/Magdir/wordprocessors
D magic/Magdir/wsdl
D magic/Magdir/xdelta
D magic/Magdir/xenix
D magic/Magdir/xilinx
D magic/Magdir/xo65
D magic/Magdir/xwindows
D magic/Magdir/zfs
D magic/Magdir/zilog
D magic/Magdir/zyxel
+ svn mv Magdir magic/Magdir
A magic/Magdir
D Magdir
D Magdir/acorn
D Magdir/adi
D Magdir/adventure
D Magdir/allegro
D Magdir/alliant
D Magdir/amanda
D Magdir/amigaos
D Magdir/animation
D Magdir/apl
D Magdir/apple
D Magdir/applix
D Magdir/archive
D Magdir/assembler
D Magdir/asterix
D Magdir/att3b
D Magdir/audio
D Magdir/basis
D Magdir/bflt
D Magdir/blcr
D Magdir/blender
D Magdir/blit
D Magdir/bout
D Magdir/bsdi
D Magdir/bsi
D Magdir/btsnoop
D Magdir/c-lang
D Magdir/c64
D Magdir/cad
D Magdir/cafebabe
D Magdir/cddb
D Magdir/chord
D Magdir/cisco
D Magdir/citrus
D Magdir/clarion
D Magdir/claris
D Magdir/clipper
D Magdir/commands
D Magdir/communications
D Magdir/compress
D Magdir/console
D Magdir/convex
D Magdir/cracklib
D Magdir/ctags
D Magdir/cups
D Magdir/dact
D Magdir/database
D Magdir/diamond
D Magdir/diff
D Magdir/digital
D Magdir/dolby
D Magdir/dump
D Magdir/dyadic
D Magdir/ebml
D Magdir/editors
D Magdir/efi
D Magdir/elf
D Magdir/encore
D Magdir/epoc
D Magdir/erlang
D Magdir/esri
D Magdir/fcs
D Magdir/filesystems
D Magdir/flash
D Magdir/fonts
D Magdir/fortran
D Magdir/frame
D Magdir/freebsd
D Magdir/fsav
D Magdir/fusecompress
D Magdir/games
D Magdir/gcc
D Magdir/geo
D Magdir/geos
D Magdir/gimp
D Magdir/gnome-keyring
D Magdir/gnu
D Magdir/gnumeric
D Magdir/grace
D Magdir/graphviz
D Magdir/gringotts
D Magdir/guile
D Magdir/hitachi-sh
D Magdir/hp
D Magdir/human68k
D Magdir/ibm370
D Magdir/ibm6000
D Magdir/iff
D Magdir/images
D Magdir/inform
D Magdir/intel
D Magdir/interleaf
D Magdir/island
D Magdir/ispell
D Magdir/isz
D Magdir/java
D Magdir/jpeg
D Magdir/karma
D Magdir/kde
D Magdir/kml
D Magdir/lecter
D Magdir/lex
D Magdir/lif
D Magdir/linux
D Magdir/lisp
D Magdir/llvm
D Magdir/lua
D Magdir/luks
D Magdir/m4
D Magdir/mach
D Magdir/macintosh
D Magdir/magic
D Magdir/mail.news
D Magdir/make
D Magdir/maple
D Magdir/marc21
D Magdir/mathcad
D Magdir/mathematica
D Magdir/matroska
D Magdir/mcrypt
D Magdir/mercurial
D Magdir/metastore
D Magdir/mime
D Magdir/mips
D Magdir/mirage
D Magdir/misctools
D Magdir/mkid
D Magdir/mlssa
D Magdir/mmdf
D Magdir/modem
D Magdir/motorola
D Magdir/mozilla
D Magdir/msdos
D Magdir/msooxml
D Magdir/msvc
D Magdir/mup
D Magdir/music
D Magdir/natinst
D Magdir/ncr
D Magdir/netbsd
D Magdir/netscape
D Magdir/netware
D Magdir/news
D Magdir/nitpicker
D Magdir/oasis
D Magdir/ocaml
D Magdir/octave
D Magdir/ole2compounddocs
D Magdir/olf
D Magdir/os2
D Magdir/os400
D Magdir/os9
D Magdir/osf1
D Magdir/palm
D Magdir/parix
D Magdir/parrot
D Magdir/pascal
D Magdir/pbm
D Magdir/pdf
D Magdir/pdp
D Magdir/perl
D Magdir/pgp
D Magdir/pkgadd
D Magdir/plan9
D Magdir/plus5
D Magdir/printer
D Magdir/project
D Magdir/psdbms
D Magdir/pulsar
D Magdir/pyramid
D Magdir/python
D Magdir/revision
D Magdir/riff
D Magdir/rinex
D Magdir/rpm
D Magdir/rtf
D Magdir/ruby
D Magdir/sc
D Magdir/sccs
D Magdir/scientific
D Magdir/securitycerts
D Magdir/selinux
D Magdir/sendmail
D Magdir/sequent
D Magdir/sgi
D Magdir/sgml
D Magdir/sharc
D Magdir/sinclair
D Magdir/sisu
D Magdir/sketch
D Magdir/smalltalk
D Magdir/smile
D Magdir/sniffer
D Magdir/softquad
D Magdir/spec
D Magdir/spectrum
D Magdir/sql
D Magdir/ssh
D Magdir/ssl
D Magdir/sun
D Magdir/sysex
D Magdir/tcl
D Magdir/teapot
D Magdir/terminfo
D Magdir/tex
D Magdir/tgif
D Magdir/ti-8x
D Magdir/timezone
D Magdir/troff
D Magdir/tuxedo
D Magdir/typeset
D Magdir/unicode
D Magdir/unknown
D Magdir/uuencode
D Magdir/varied.out
D Magdir/varied.script
D Magdir/vax
D Magdir/vicar
D Magdir/virtual
D Magdir/virtutech
D Magdir/visx
D Magdir/vms
D Magdir/vmware
D Magdir/vorbis
D Magdir/vxl
D Magdir/warc
D Magdir/weak
D Magdir/windows
D Magdir/wireless
D Magdir/wordprocessors
D Magdir/wsdl
D Magdir/xdelta
D Magdir/xenix
D Magdir/xilinx
D Magdir/xo65
D Magdir/xwindows
D Magdir/zfs
D Magdir/zilog
D Magdir/zyxel
+ svn merge --accept postpone ^/vendor/file/dist/Magdir_at_r267842 ^/vendor/file/dist/magic/Magdir_at_r267843 magic/Magdir
--- Merging differences between repository URLs into 'magic/Magdir':
U magic/Magdir/geo
U magic/Magdir/flash
A magic/Magdir/gnome
U magic/Magdir/cafebabe
U magic/Magdir/pdf
U magic/Magdir/ibm6000
U magic/Magdir/pdp
U magic/Magdir/sniffer
U magic/Magdir/motorola
A magic/Magdir/icc
U magic/Magdir/rpm
U magic/Magdir/mach
U magic/Magdir/maple
U magic/Magdir/unknown
C magic/Magdir/commands
U magic/Magdir/perl
U magic/Magdir/isz
U magic/Magdir/elf
U magic/Magdir/encore
U magic/Magdir/sysex
U magic/Magdir/amigaos
U magic/Magdir/virtual
U magic/Magdir/cad
U magic/Magdir/windows
U magic/Magdir/audio
A magic/Magdir/javascript
A magic/Magdir/pgf
U magic/Magdir/assembler
U magic/Magdir/scientific
U magic/Magdir/msdos
U magic/Magdir/riff
U magic/Magdir/epoc
U magic/Magdir/bflt
U magic/Magdir/nitpicker
U magic/Magdir/palm
U magic/Magdir/dyadic
U magic/Magdir/revision
U magic/Magdir/sql
U magic/Magdir/misctools
U magic/Magdir/varied.out
U magic/Magdir/hitachi-sh
U magic/Magdir/xwindows
U magic/Magdir/fonts
A magic/Magdir/neko
U magic/Magdir/wsdl
U magic/Magdir/netbsd
U magic/Magdir/natinst
U magic/Magdir/bsdi
A magic/Magdir/pwsafe
A magic/Magdir/keepass
U magic/Magdir/adventure
U magic/Magdir/ssh
U magic/Magdir/msooxml
U magic/Magdir/ssl
U magic/Magdir/vorbis
U magic/Magdir/vms
U magic/Magdir/filesystems
U magic/Magdir/dolby
A magic/Magdir/symbos
A magic/Magdir/ctf
U magic/Magdir/digital
U magic/Magdir/animation
U magic/Magdir/matroska
U magic/Magdir/mail.news
U magic/Magdir/sharc
U magic/Magdir/zfs
U magic/Magdir/claris
A magic/Magdir/map
U magic/Magdir/tcl
U magic/Magdir/printer
U magic/Magdir/macintosh
U magic/Magdir/marc21
U magic/Magdir/sun
U magic/Magdir/llvm
U magic/Magdir/att3b
U magic/Magdir/python
U magic/Magdir/sequent
U magic/Magdir/jpeg
U magic/Magdir/gnu
U magic/Magdir/clipper
U magic/Magdir/dump
U magic/Magdir/diff
U magic/Magdir/ti-8x
U magic/Magdir/cups
U magic/Magdir/xilinx
U magic/Magdir/troff
U magic/Magdir/lua
U magic/Magdir/sgi
U magic/Magdir/gimp
U magic/Magdir/vax
U magic/Magdir/tex
U magic/Magdir/console
U magic/Magdir/sgml
A magic/Magdir/msx
U magic/Magdir/fortran
U magic/Magdir/intel
A magic/Magdir/android
U magic/Magdir/clarion
A magic/Magdir/uterus
U magic/Magdir/graphviz
A magic/Magdir/gpt
U magic/Magdir/wordprocessors
A magic/Magdir/macos
U magic/Magdir/hp
U magic/Magdir/varied.script
U magic/Magdir/java
U magic/Magdir/ncr
U magic/Magdir/linux
U magic/Magdir/ibm370
U magic/Magdir/efi
A magic/Magdir/aout
A magic/Magdir/sereal
A magic/Magdir/blackberry
U magic/Magdir/games
U magic/Magdir/c-lang
U magic/Magdir/oasis
U magic/Magdir/archive
A magic/Magdir/pbf
A magic/Magdir/cubemap
U magic/Magdir/karma
U magic/Magdir/compress
U magic/Magdir/fsav
U magic/Magdir/apple
U magic/Magdir/convex
U magic/Magdir/database
U magic/Magdir/images
U magic/Magdir/mips
D magic/Magdir/gnome-keyring
--- Recording mergeinfo for merge between repository URLs into 'magic/Magdir':
U magic/Magdir
Summary of conflicts:
Text conflicts: 1
+ svn resolve --accept theirs-conflict magic/Magdir/commands
Resolved conflicted state of 'magic/Magdir/commands'
+ svn revert apprentice.c
+ svn rm src/apprentice.c
D src/apprentice.c
+ svn mv apprentice.c src/apprentice.c
A src/apprentice.c
D apprentice.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/apprentice.c src/apprentice.c
--- Recording mergeinfo for merge of r267877 into 'src/apprentice.c':
G src/apprentice.c
+ svn revert apptype.c
+ svn rm src/apptype.c
D src/apptype.c
+ svn mv apptype.c src/apptype.c
A src/apptype.c
D apptype.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/apptype.c src/apptype.c
--- Recording mergeinfo for merge of r267877 into 'src/apptype.c':
G src/apptype.c
+ svn revert ascmagic.c
+ svn rm src/ascmagic.c
D src/ascmagic.c
+ svn mv ascmagic.c src/ascmagic.c
A src/ascmagic.c
D ascmagic.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/ascmagic.c src/ascmagic.c
--- Recording mergeinfo for merge of r267877 into 'src/ascmagic.c':
G src/ascmagic.c
+ svn revert compress.c
+ svn rm src/compress.c
D src/compress.c
+ svn mv compress.c src/compress.c
A src/compress.c
D compress.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/compress.c src/compress.c
--- Recording mergeinfo for merge of r267877 into 'src/compress.c':
G src/compress.c
+ svn revert file.c
+ svn rm src/file.c
D src/file.c
+ svn mv file.c src/file.c
A src/file.c
D file.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/file.c src/file.c
--- Recording mergeinfo for merge of r267877 into 'src/file.c':
G src/file.c
+ svn revert file.h
+ svn rm src/file.h
D src/file.h
+ svn mv file.h src/file.h
A src/file.h
D file.h
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/file.h src/file.h
--- Recording mergeinfo for merge of r267877 into 'src/file.h':
G src/file.h
+ svn revert file.man
+ svn rm doc/file.man
D doc/file.man
+ svn mv file.man doc/file.man
A doc/file.man
D file.man
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/doc/file.man doc/file.man
--- Recording mergeinfo for merge of r267877 into 'doc/file.man':
G doc/file.man
+ svn revert file_opts.h
+ svn rm src/file_opts.h
D src/file_opts.h
+ svn mv file_opts.h src/file_opts.h
A src/file_opts.h
D file_opts.h
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/file_opts.h src/file_opts.h
--- Recording mergeinfo for merge of r267877 into 'src/file_opts.h':
G src/file_opts.h
+ svn revert fsmagic.c
+ svn rm src/fsmagic.c
D src/fsmagic.c
+ svn mv fsmagic.c src/fsmagic.c
A src/fsmagic.c
D fsmagic.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/fsmagic.c src/fsmagic.c
--- Recording mergeinfo for merge of r267877 into 'src/fsmagic.c':
G src/fsmagic.c
+ svn revert funcs.c
+ svn rm src/funcs.c
D src/funcs.c
+ svn mv funcs.c src/funcs.c
A src/funcs.c
D funcs.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/funcs.c src/funcs.c
--- Recording mergeinfo for merge of r267877 into 'src/funcs.c':
G src/funcs.c
+ svn revert is_tar.c
+ svn rm src/is_tar.c
D src/is_tar.c
+ svn mv is_tar.c src/is_tar.c
A src/is_tar.c
D is_tar.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/is_tar.c src/is_tar.c
--- Recording mergeinfo for merge of r267877 into 'src/is_tar.c':
G src/is_tar.c
+ svn revert libmagic.man
+ svn rm doc/libmagic.man
D doc/libmagic.man
+ svn mv libmagic.man doc/libmagic.man
A doc/libmagic.man
D libmagic.man
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/doc/libmagic.man doc/libmagic.man
--- Recording mergeinfo for merge of r267877 into 'doc/libmagic.man':
G doc/libmagic.man
+ svn revert magic.c
+ svn rm src/magic.c
D src/magic.c
+ svn mv magic.c src/magic.c
A src/magic.c
D magic.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/magic.c src/magic.c
--- Recording mergeinfo for merge of r267877 into 'src/magic.c':
G src/magic.c
+ svn revert magic.h
+ svn rm src/magic.h
D src/magic.h
+ svn mv magic.h src/magic.h
A src/magic.h
D magic.h
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/magic.h src/magic.h
--- Recording mergeinfo for merge of r267877 into 'src/magic.h':
G src/magic.h
+ svn revert magic.man
+ svn rm doc/magic.man
D doc/magic.man
+ svn mv magic.man doc/magic.man
A doc/magic.man
D magic.man
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/doc/magic.man doc/magic.man
--- Recording mergeinfo for merge of r267877 into 'doc/magic.man':
G doc/magic.man
+ svn revert mygetopt.h
+ svn rm src/mygetopt.h
D src/mygetopt.h
+ svn mv mygetopt.h src/mygetopt.h
A src/mygetopt.h
D mygetopt.h
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/mygetopt.h src/mygetopt.h
--- Recording mergeinfo for merge of r267877 into 'src/mygetopt.h':
G src/mygetopt.h
+ svn revert print.c
+ svn rm src/print.c
D src/print.c
+ svn mv print.c src/print.c
A src/print.c
D print.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/print.c src/print.c
--- Recording mergeinfo for merge of r267877 into 'src/print.c':
G src/print.c
+ svn revert readelf.c
+ svn rm src/readelf.c
D src/readelf.c
+ svn mv readelf.c src/readelf.c
A src/readelf.c
D readelf.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/readelf.c src/readelf.c
--- Recording mergeinfo for merge of r267877 into 'src/readelf.c':
G src/readelf.c
+ svn revert readelf.h
+ svn rm src/readelf.h
D src/readelf.h
+ svn mv readelf.h src/readelf.h
A src/readelf.h
D readelf.h
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/readelf.h src/readelf.h
--- Recording mergeinfo for merge of r267877 into 'src/readelf.h':
G src/readelf.h
+ svn revert softmagic.c
+ svn rm src/softmagic.c
D src/softmagic.c
+ svn mv softmagic.c src/softmagic.c
A src/softmagic.c
D softmagic.c
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/softmagic.c src/softmagic.c
--- Recording mergeinfo for merge of r267877 into 'src/softmagic.c':
G src/softmagic.c
+ svn revert tar.h
+ svn rm src/tar.h
D src/tar.h
+ svn mv tar.h src/tar.h
A src/tar.h
D tar.h
+ svn merge --accept postpone -c 267877 ^/vendor/file/dist/src/tar.h src/tar.h
--- Recording mergeinfo for merge of r267877 into 'src/tar.h':
G src/tar.h
+ svn status
M .
M ChangeLog
D Header
> moved to magic/Header
D Localstuff
> moved to magic/Localstuff
D Magdir
> moved to magic/Magdir
D Magdir/acorn
D Magdir/adi
D Magdir/adventure
D Magdir/allegro
D Magdir/alliant
D Magdir/amanda
D Magdir/amigaos
D Magdir/animation
D Magdir/apl
D Magdir/apple
D Magdir/applix
D Magdir/archive
D Magdir/assembler
D Magdir/asterix
D Magdir/att3b
D Magdir/audio
D Magdir/basis
D Magdir/bflt
D Magdir/blcr
D Magdir/blender
D Magdir/blit
D Magdir/bout
D Magdir/bsdi
D Magdir/bsi
D Magdir/btsnoop
D Magdir/c-lang
D Magdir/c64
D Magdir/cad
D Magdir/cafebabe
D Magdir/cddb
D Magdir/chord
D Magdir/cisco
D Magdir/citrus
D Magdir/clarion
D Magdir/claris
D Magdir/clipper
D Magdir/commands
D Magdir/communications
D Magdir/compress
D Magdir/console
D Magdir/convex
D Magdir/cracklib
D Magdir/ctags
D Magdir/cups
D Magdir/dact
D Magdir/database
D Magdir/diamond
D Magdir/diff
D Magdir/digital
D Magdir/dolby
D Magdir/dump
D Magdir/dyadic
D Magdir/ebml
D Magdir/editors
D Magdir/efi
D Magdir/elf
D Magdir/encore
D Magdir/epoc
D Magdir/erlang
D Magdir/esri
D Magdir/fcs
D Magdir/filesystems
D Magdir/flash
D Magdir/fonts
D Magdir/fortran
D Magdir/frame
D Magdir/freebsd
D Magdir/fsav
D Magdir/fusecompress
D Magdir/games
D Magdir/gcc
D Magdir/geo
D Magdir/geos
D Magdir/gimp
D Magdir/gnome-keyring
D Magdir/gnu
D Magdir/gnumeric
D Magdir/grace
D Magdir/graphviz
D Magdir/gringotts
D Magdir/guile
D Magdir/hitachi-sh
D Magdir/hp
D Magdir/human68k
D Magdir/ibm370
D Magdir/ibm6000
D Magdir/iff
D Magdir/images
D Magdir/inform
D Magdir/intel
D Magdir/interleaf
D Magdir/island
D Magdir/ispell
D Magdir/isz
D Magdir/java
D Magdir/jpeg
D Magdir/karma
D Magdir/kde
D Magdir/kml
D Magdir/lecter
D Magdir/lex
D Magdir/lif
D Magdir/linux
D Magdir/lisp
D Magdir/llvm
D Magdir/lua
D Magdir/luks
D Magdir/m4
D Magdir/mach
D Magdir/macintosh
D Magdir/magic
D Magdir/mail.news
D Magdir/make
D Magdir/maple
D Magdir/marc21
D Magdir/mathcad
D Magdir/mathematica
D Magdir/matroska
D Magdir/mcrypt
D Magdir/mercurial
D Magdir/metastore
D Magdir/mime
D Magdir/mips
D Magdir/mirage
D Magdir/misctools
D Magdir/mkid
D Magdir/mlssa
D Magdir/mmdf
D Magdir/modem
D Magdir/motorola
D Magdir/mozilla
D Magdir/msdos
D Magdir/msooxml
D Magdir/msvc
D Magdir/mup
D Magdir/music
D Magdir/natinst
D Magdir/ncr
D Magdir/netbsd
D Magdir/netscape
D Magdir/netware
D Magdir/news
D Magdir/nitpicker
D Magdir/oasis
D Magdir/ocaml
D Magdir/octave
D Magdir/ole2compounddocs
D Magdir/olf
D Magdir/os2
D Magdir/os400
D Magdir/os9
D Magdir/osf1
D Magdir/palm
D Magdir/parix
D Magdir/parrot
D Magdir/pascal
D Magdir/pbm
D Magdir/pdf
D Magdir/pdp
D Magdir/perl
D Magdir/pgp
D Magdir/pkgadd
D Magdir/plan9
D Magdir/plus5
D Magdir/printer
D Magdir/project
D Magdir/psdbms
D Magdir/pulsar
D Magdir/pyramid
D Magdir/python
D Magdir/revision
D Magdir/riff
D Magdir/rinex
D Magdir/rpm
D Magdir/rtf
D Magdir/ruby
D Magdir/sc
D Magdir/sccs
D Magdir/scientific
D Magdir/securitycerts
D Magdir/selinux
D Magdir/sendmail
D Magdir/sequent
D Magdir/sgi
D Magdir/sgml
D Magdir/sharc
D Magdir/sinclair
D Magdir/sisu
D Magdir/sketch
D Magdir/smalltalk
D Magdir/smile
D Magdir/sniffer
D Magdir/softquad
D Magdir/spec
D Magdir/spectrum
D Magdir/sql
D Magdir/ssh
D Magdir/ssl
D Magdir/sun
D Magdir/sysex
D Magdir/tcl
D Magdir/teapot
D Magdir/terminfo
D Magdir/tex
D Magdir/tgif
D Magdir/ti-8x
D Magdir/timezone
D Magdir/troff
D Magdir/tuxedo
D Magdir/typeset
D Magdir/unicode
D Magdir/unknown
D Magdir/uuencode
D Magdir/varied.out
D Magdir/varied.script
D Magdir/vax
D Magdir/vicar
D Magdir/virtual
D Magdir/virtutech
D Magdir/visx
D Magdir/vms
D Magdir/vmware
D Magdir/vorbis
D Magdir/vxl
D Magdir/warc
D Magdir/weak
D Magdir/windows
D Magdir/wireless
D Magdir/wordprocessors
D Magdir/wsdl
D Magdir/xdelta
D Magdir/xenix
D Magdir/xilinx
D Magdir/xo65
D Magdir/xwindows
D Magdir/zfs
D Magdir/zilog
D Magdir/zyxel
M Makefile.am
D Makefile.am-src
M Makefile.in
M README
M TODO
M aclocal.m4
D apprentice.c
> moved to src/apprentice.c
D apptype.c
> moved to src/apptype.c
D ascmagic.c
> moved to src/ascmagic.c
D asprintf.c
D cdf.c
D cdf.h
D cdf_time.c
M compile
D compress.c
> moved to src/compress.c
A + config.guess
M config.h.in
A + config.sub
M configure
M configure.ac
A + depcomp
A + doc
RM + doc/file.man
> moved from file.man
RM + doc/libmagic.man
> moved from libmagic.man
RM + doc/magic.man
> moved from magic.man
D elfclass.h
D encoding.c
D file.c
> moved to src/file.c
D file.h
> moved to src/file.h
D file.man
> moved to doc/file.man
D file_opts.h
> moved to src/file_opts.h
D fsmagic.c
> moved to src/fsmagic.c
D funcs.c
> moved to src/funcs.c
D getline.c
D getopt_long.c
M install-sh
D is_tar.c
> moved to src/is_tar.c
D libmagic.man
> moved to doc/libmagic.man
A + ltmain.sh
A + m4
A + magic
RM + magic/Header
> moved from Header
RM + magic/Localstuff
> moved from Localstuff
RM + magic/Magdir
> moved from Magdir
M + magic/Magdir/adventure
M + magic/Magdir/amigaos
A + magic/Magdir/android
M + magic/Magdir/animation
A + magic/Magdir/aout
M + magic/Magdir/apple
M + magic/Magdir/archive
M + magic/Magdir/assembler
M + magic/Magdir/att3b
M + magic/Magdir/audio
M + magic/Magdir/bflt
A + magic/Magdir/blackberry
M + magic/Magdir/bsdi
M + magic/Magdir/c-lang
M + magic/Magdir/cad
M + magic/Magdir/cafebabe
M + magic/Magdir/clarion
M + magic/Magdir/claris
M + magic/Magdir/clipper
M + magic/Magdir/commands
M + magic/Magdir/compress
M + magic/Magdir/console
M + magic/Magdir/convex
A + magic/Magdir/ctf
A + magic/Magdir/cubemap
M + magic/Magdir/cups
M + magic/Magdir/database
M + magic/Magdir/diff
M + magic/Magdir/digital
M + magic/Magdir/dolby
M + magic/Magdir/dump
M + magic/Magdir/dyadic
M + magic/Magdir/efi
M + magic/Magdir/elf
M + magic/Magdir/encore
M + magic/Magdir/epoc
M + magic/Magdir/filesystems
M + magic/Magdir/flash
M + magic/Magdir/fonts
M + magic/Magdir/fortran
M + magic/Magdir/fsav
M + magic/Magdir/games
M + magic/Magdir/geo
M + magic/Magdir/gimp
A + magic/Magdir/gnome
D + magic/Magdir/gnome-keyring
M + magic/Magdir/gnu
A + magic/Magdir/gpt
M + magic/Magdir/graphviz
M + magic/Magdir/hitachi-sh
M + magic/Magdir/hp
M + magic/Magdir/ibm370
M + magic/Magdir/ibm6000
A + magic/Magdir/icc
M + magic/Magdir/images
M + magic/Magdir/intel
M + magic/Magdir/isz
M + magic/Magdir/java
A + magic/Magdir/javascript
M + magic/Magdir/jpeg
M + magic/Magdir/karma
A + magic/Magdir/keepass
M + magic/Magdir/linux
M + magic/Magdir/llvm
M + magic/Magdir/lua
M + magic/Magdir/mach
M + magic/Magdir/macintosh
A + magic/Magdir/macos
M + magic/Magdir/mail.news
A + magic/Magdir/map
M + magic/Magdir/maple
M + magic/Magdir/marc21
M + magic/Magdir/matroska
M + magic/Magdir/mips
M + magic/Magdir/misctools
M + magic/Magdir/motorola
M + magic/Magdir/msdos
M + magic/Magdir/msooxml
A + magic/Magdir/msx
M + magic/Magdir/natinst
M + magic/Magdir/ncr
A + magic/Magdir/neko
M + magic/Magdir/netbsd
M + magic/Magdir/nitpicker
M + magic/Magdir/oasis
M + magic/Magdir/palm
A + magic/Magdir/pbf
M + magic/Magdir/pdf
M + magic/Magdir/pdp
M + magic/Magdir/perl
A + magic/Magdir/pgf
M + magic/Magdir/printer
A + magic/Magdir/pwsafe
M + magic/Magdir/python
M + magic/Magdir/revision
M + magic/Magdir/riff
M + magic/Magdir/rpm
M + magic/Magdir/scientific
M + magic/Magdir/sequent
A + magic/Magdir/sereal
M + magic/Magdir/sgi
M + magic/Magdir/sgml
M + magic/Magdir/sharc
M + magic/Magdir/sniffer
M + magic/Magdir/sql
M + magic/Magdir/ssh
M + magic/Magdir/ssl
M + magic/Magdir/sun
A + magic/Magdir/symbos
M + magic/Magdir/sysex
M + magic/Magdir/tcl
M + magic/Magdir/tex
M + magic/Magdir/ti-8x
M + magic/Magdir/troff
M + magic/Magdir/unknown
A + magic/Magdir/uterus
M + magic/Magdir/varied.out
M + magic/Magdir/varied.script
M + magic/Magdir/vax
M + magic/Magdir/virtual
M + magic/Magdir/vms
M + magic/Magdir/vorbis
M + magic/Magdir/windows
M + magic/Magdir/wordprocessors
M + magic/Magdir/wsdl
M + magic/Magdir/xilinx
M + magic/Magdir/xwindows
M + magic/Magdir/zfs
D magic.c
> moved to src/magic.c
D magic.h
> moved to src/magic.h
D magic.man
> moved to doc/magic.man
A + missing
D mygetopt.h
> moved to src/mygetopt.h
D print.c
> moved to src/print.c
A + python
D readcdf.c
D readelf.c
> moved to src/readelf.c
D readelf.h
> moved to src/readelf.h
D softmagic.c
> moved to src/softmagic.c
A + src
RM + src/apprentice.c
> moved from apprentice.c
RM + src/apptype.c
> moved from apptype.c
RM + src/ascmagic.c
> moved from ascmagic.c
RM + src/compress.c
> moved from compress.c
RM + src/file.c
> moved from file.c
RM + src/file.h
> moved from file.h
RM + src/file_opts.h
> moved from file_opts.h
RM + src/fsmagic.c
> moved from fsmagic.c
RM + src/funcs.c
> moved from funcs.c
RM + src/is_tar.c
> moved from is_tar.c
RM + src/magic.c
> moved from magic.c
RM + src/magic.h
> moved from magic.h
RM + src/mygetopt.h
> moved from mygetopt.h
RM + src/print.c
> moved from print.c
RM + src/readelf.c
> moved from readelf.c
RM + src/readelf.h
> moved from readelf.h
RM + src/softmagic.c
> moved from softmagic.c
RM + src/tar.h
> moved from tar.h
D strlcat.c
D strlcpy.c
D tar.h
> moved to src/tar.h
M tests/Makefile.am
M tests/Makefile.in
M tests/README
A + tests/escapevel.result
A + tests/escapevel.testfile
D tests/gedcom.magic
M tests/gedcom.result
A + tests/issue311docx.result
A + tests/issue311docx.testfile
D vasprintf.c
+ svn info src
+ grep ^Copied
Copied From URL: svn://svn.freebsd.org/base/vendor/file/dist/src
Copied From Rev: 267843
+ svn info src/ascmagic.c
+ grep ^Copied
Copied From URL: svn://svn.freebsd.org/base/head/contrib/file/ascmagic.c
Copied From Rev: 267877
Received on 2014-06-26 21:02:27 CEST