Git conversion

Daniel Silverstone Mon, 04 Jun 2012 07:21:16 -0700

Hi,

Attached you will find the identity map I am using for the Git conversion for
the NetSurf repositories.  Also attached is the SVN-All-Fast-Export config
we're using.


Note that it explicitly throws a small amount of the history away because it's
impossible to convert usefully at this time.  One thing we explicitly throw
away is the top level Makefile.  We will have to look into creating a
replacment for this at some point; but since the repositories are now nicely
separated out, there isn't a trivial way to do this.

If anyone has any ideas on how to improve the conversion, please let me know.
Ditto, if any of the identities are incorrectly mapped, please let me know.

You can see temporary conversions at http://git.netsurf-browser.org/ and you
can clone from the git:// URLs provided.

For resolving access to the NetSurf repositories, I will need SSH public keys
from anyone who thinks they deserve write access to any part of the repository.

Please email me *directly* with your SSH public key attached.  You can find it
in ~/.ssh/id_rsa.pub typically.

If you tend to make commits from more than one place and you have different SSH
keys in each location, then please supply me with N *different* public keys.
Give each one an obvious name so you know which is which for later
management/replacement strategies.

I will be working on a set of rules for managing the NetSurf repositories and
also on various tools to replace the current SVN ones we use.  For example, for
the generation of the testament.

If anyone is interested in the software being developed to allow us to manage
the git repositories, see http://www.gitano.org.uk/.

D.

-- 
Daniel Silverstone                       http://www.netsurf-browser.org/
PGP mail accepted and encouraged.            Key Id: 3CCE BABE 206C 3B69

create repository toolchains
end repository

create repository libwebp
end repository

create repository librosprite
end repository

create repository struggleyb-tools
end repository

create repository debian
end repository

create repository libnspng
end repository

create repository libnsfb
end repository

create repository libdomts-transform-perl
end repository

create repository tools
end repository

create repository iconv
end repository

create repository svn-tools
end repository

create repository libnsgif
end repository

create repository libnsbmp
end repository

create repository json-c
end repository

create repository backup
end repository

create repository libsvgtiny
end repository

create repository art
end repository

create repository netsurf
end repository

create repository netsurfweb
end repository

create repository netsurftest
end repository

create repository nstheme
end repository

create repository rufl
end repository

create repository pencil
end repository

create repository changemailer
end repository

create repository netsurfbuild
end repository

create repository libcss
end repository

create repository libdom
end repository

create repository hubbub
end repository

create repository libparserutils
end repository

create repository libwapcaplet
end repository

# Special top level ignores
match /trunk/libharu/
end match

# Now, generic matches

match /toolchains/
  repository toolchains
  branch master
end match

match /trunk/dom/
  repository libdom
  branch master
end match

match /trunk/([^/]+)/
  repository \1
  branch master
end match

match /import/jshaw/libsprite/
  repository librosprite
  branch master
end match

match /import/jshaw/
end match

match /import/([^/]+)/
  repository \1
  branch master
end match

# Now all our branches
match /branches/jmb/ns-dom/
  repository netsurf
  branch refs/old/jmb/ns-dom
end match

match /branches/jmb/new-cache/
  repository netsurf
  branch refs/old/jmb/new-cache
end match

match /branches/jmb/cookies/
  repository netsurf
  branch refs/old/jmb/cookies
end match

match /branches/rjek/glade/
  repository netsurf
  branch refs/old/rjek/glade
end match

match /branches/dsilvers/gtk-bitmap-pretile/
  repository netsurf
  branch refs/old/dsilvers/gtk-bitmap-pretile
end match

match /branches/dsilvers/netsurf-remove-curl/
  repository netsurf
  branch refs/old/dsilvers/remove-curl
end match

match /branches/stevef/toolbars/
  repository netsurf
  branch refs/old/stevef/toolbars
end match

match /branches/vince/libcss-parser/
  repository libcss
  branch refs/old/vince/parser
end match

match /branches/vince/netsurf-options/
  repository netsurf
  branch refs/old/vince/options
end match

match /branches/jmb/dom-strings/
  repository libdom
  branch refs/old/jmb/strings
end match

match /branches/jmb/content-factory/
  repository netsurf
  branch refs/old/jmb/content-factory
end match

match /branches/mmu_man/netsurf-gopher-support/
  repository netsurf
  branch refs/old/mmu_man/gopher-support
end match

match /branches/mmu_man/netsurf-gopher-support-v3/
  repository netsurf
  branch refs/old/mmu_man/gopher-support-v3
end match

match /branches/mmu_man/netsurf-gopher-support-v2/
  repository netsurf
  branch refs/old/mmu_man/gopher-support-v2
end match

match /branches/jmb/dom-alloc-purge/
  repository libdom
  branch refs/old/jmb/alloc-purge
end match

match /branches/jmb/opaque-browser/
  repository netsurf
  branch refs/old/jmb/opaque-browser
end match

match /branches/dsilvers/stop/
  repository netsurf
  branch refs/old/dsilvers/stop
end match

match /branches/rjw/frames/
  repository netsurf
  branch refs/old/rjw/frames
end match

match /branches/dsilvers/gtk-frames/
  repository netsurf
  branch refs/old/dsilvers/gtk-frames
end match

match /branches/dsilvers/scheme-switcher/
  repository netsurf
  branch refs/old/dsilvers/scheme-switcher
end match

match /branches/dsilvers/resources-scheme/
  repository netsurf
  branch refs/old/dsilvers/resources-scheme
end match

match /branches/2/
  repository netsurf
  branch refs/tags/releases/2
end match

match /branches/release/libpencil/([^/]+)/
  repository pencil
  branch refs/tags/releases/\1
end match

match /branches/release/librufl/([^/]+)/
  repository rufl
  branch refs/tags/releases/\1
end match

match /branches/release/([^/]+)/([^/]+)/
  repository \1
  branch refs/tags/releases/\2
end match

match /tags/libpencil/([0-9][^/]+)/
  repository pencil
  branch refs/tags/releases/\1
end match

match /tags/librufl/([0-9][^/]+)/
  repository rufl
  branch refs/tags/releases/\1
end match

match /tags/([^/]+)/([0-9][^/]+)/\1/
  repository \1
  branch refs/tags/releases/\2
end match

match /tags/([0-9\.]+)/netsurf/
  repository netsurf
  branch refs/tags/releases/\1
end match

match /tags/([^/]+)/([0-9][^/]+)/
  repository \1
  branch refs/tags/releases/\2
end match

match /branches/([0-9\.]+)/netsurf/
  repository netsurf
  branch refs/tags/releases/\1
end match

match /branches/adamblokus/netsurf/
  repository netsurf
  branch refs/old/adamblokus/haru
end match

match /branches/mikeL/netsurf/
  repository netsurf
  branch refs/old/mikeL/netsurf
end match

match /branches/dynis/netsurf/
  repository netsurf
  branch refs/old/dynis/netsurf
end match

match /branches/dynis/libnsgif/
  repository libnsgif
  branch master
end match

match /branches/dynis/libnsbmp/
  repository libnsbmp
  branch master
end match

match /branches/dsilvers/slab-for-box/
  repository netsurf
  branch refs/old/dsilvers/slab-for-box
end match

match /branches/takkaria/hubbub-parserutils/
  repository hubbub
  branch refs/old/takkaria/parserutils
end match

match /branches/dynis/libfandango/
  repository netsurf
  branch refs/old/dynis/libfandango
end match

match /branches/takkaria/netsurf-hubbub/
  repository netsurf
  branch refs/old/takkaria/hubbub
end match

match /branches/dynis/newfandango/
  repository netsurf
  branch refs/old/dynis/newfandango
end match

match /branches/dynis/fantesto/
  repository netsurf
  branch refs/old/dynis/fantesto
end match

match /branches/mikeL/netsurf/
  repository netsurf
  branch refs/old/mikeL/netsurf
end match

match /branches/dynis/netsurf/
  repository netsurf
  branch refs/old/dynis/netsurf
end match

match /branches/dynis/libnsgif/
  repository libnsgif
  branch master
end match

match /branches/dynis/libnsbmp/
  repository libnsbmp
  branch master
end match

match /branches/dsilvers/slab-for-box/
  repository netsurf
  branch refs/old/dsilvers/slab-for-box
end match

match /branches/takkaria/hubbub-parserutils/
  repository hubbub
  branch refs/old/takkaria/parserutils
end match

match /branches/dynis/libfandango/
  repository netsurf
  branch refs/old/dynis/libfandango
end match

match /branches/takkaria/netsurf-hubbub/
  repository netsurf
  branch refs/old/takkaria/hubbub
end match

match /branches/dynis/newfandango/
  repository netsurf
  branch refs/old/dynis/newfandango
end match

match /branches/dynis/fantesto/
  repository netsurf
  branch refs/old/dynis/fantesto
end match

match /branches/vince/netsurf-fb/
  repository netsurf
  branch refs/old/vince/fb
end match

match /branches/vince/netsurf-cairo/
  repository netsurf
  branch refs/old/vince/cairo
end match

match /branches/jmb/ns-to-libcss/
  repository netsurf
  branch refs/old/jmb/libcss
end match

match /branches/jmb/kill-reentrancy/
  repository netsurf
  branch refs/old/jmb/kill-reentrancy
end match

match /branches/jmb/ns-libcss/
  repository netsurf
  branch refs/old/jmb/libcss2
end match

match /branches/mikeL/GSoC/
  repository netsurf
  branch refs/old/mikel/gsoc
end match

match /branches/wml/
  repository netsurf
  branch refs/old/mikel/wml-gsoc
end match

match /branches/vince/netsurf-fbtk/
  repository netsurf
  branch refs/old/vince/fbtk
end match

match /branches/vince/netsurf-fbtk-rework/
  repository netsurf
  branch refs/old/vince/fbtk-rework
end match

match /branches/tlsa/frames-stuff/relpaced-elements/
  repository netsurf
  branch refs/old/tlsa/replaced-elements
end match

match /branches/tlsa/libcss-selection-speedup-and-stats/
  repository libcss
  branch refs/old/tlsa/selection-speedup-and-stats
end match

match /branches/vince/netsurf-file-fetcher/
  repository netsurf
  branch refs/old/vince/file-fetcher
end match

match /branches/struggleyb/domts-transform-perl/
  repository libdomts-transform-perl
  branch master
end match

match /branches/jmb/hubbub-errors/
  repository hubbub
  branch refs/old/jmb/errors
end match

match /branches/jmb/treeview-redux/
  repository netsurf
  branch refs/old/jmb/treeview-redux
end match

match /branches/vince/netsurf-libnsfb/
  repository netsurf
  branch refs/old/vince/libnsfb
end match

match /branches/itix/netsurf/
  repository netsurf
  branch refs/old/itix/morphos
end match

match /branches/MarkieB/favicon/
  repository netsurf
  branch refs/old/markieb/favicon
end match

match /branches/MarkieB/javafront/
  repository netsurf
  branch refs/old/markieb/javafront
end match

match /branches/MarkieB/windows/
  repository netsurf
  branch refs/old/markieb/windows
end match

match /branches/MarkieB/gtkmain/
  repository netsurf
  branch refs/old/markieb/gtkmain
end match

match /branches/MarkieB/search/
  repository netsurf
  branch refs/old/markieb/search
end match

match /branches/MarkieB/glade/
  repository netsurf
  branch refs/old/markieb/glade
end match

match /branches/MarkieB/save/
  repository netsurf
  branch refs/old/markieb/save
end match

match /branches/vince/netsurf-ncurses/
  repository netsurf
  branch refs/old/vince/ncurses
end match

match /branches/paulblokus/corewidgets/
  repository netsurf
  branch refs/old/paulblokus/corewidgets
end match

match /branches/paulblokus/selectscroll/
  repository netsurf
  branch refs/old/paulblokus/selectscroll
end match

match /branches/paulblokus/selectwidget/
  repository netsurf
  branch refs/old/paulblokus/selectwidget
end match

match /branches/paulblokus/treeview/
  repository netsurf
  branch refs/old/paulblokus/treeview
end match

match /branches/paulblokus/textinput/
  repository netsurf
  branch refs/old/paulblokus/textinput
end match

match /branches/MarkieB/fav/
  repository netsurf
  branch refs/old/markieb/fav
end match

match /branches/MarkieB/favs/
  repository netsurf
  branch refs/old/markieb/favs
end match

match /branches/MarkieB/hotlist/
  repository netsurf
  branch refs/old/markieb/hotlist
end match

match /branches/MarkieB/upload/
  repository netsurf
  branch refs/old/markieb/upload
end match

match /branches/MarkieB/history/
  repository netsurf
  branch refs/old/markieb/history
end match

match /branches/MarkieB/custom/
  repository netsurf
  branch refs/old/markieb/custom
end match

match /branches/struggleyb/libdom/
  repository libdom
  branch refs/old/struggleyb/libdom
end match

match /branches/struggleyb/libdom-events/
  repository libdom
  branch refs/old/struggleyb/events
end match

match /branches/struggleyb/libdom-html/
  repository libdom
  branch refs/old/struggleyb/html
end match

match /branches/struggleyb/tools/
  repository struggleyb-tools
  branch master
end match

match /branches/struggleyb/libdom-onestring/
  repository libdom
  branch refs/old/struggleyb/onestring
end match

match /branches/struggleyb/libdom-remain/
  repository libdom
  branch refs/old/struggleyb/remain
end match

match /branches/struggleyb/libwapcaplet/
  repository libwapcaplet
  branch refs/old/struggleyb/work
end match

# Ignore the following for now

match /trunk/Makefile
end match

match /branches/libharu/
end match

match /branches/adamblokus/harutest/
end match

match /branches/dynis/nsgiftest/
end match

match /branches/struggleyb/tags/
end match

vince Vincent Sanders <[email protected]>
tlsa Michael Drake <[email protected]>
dsilvers Daniel Silverstone <[email protected]>
rjek Rob Kendrick <[email protected]>
jmb John Mark Bell <[email protected]>
diodesign Chris Williams <[email protected]>
mmu_man François Revel <[email protected]>
joty John Tytgat <[email protected]>
bursa James Bursa <[email protected]>
chris_y Chris Young <[email protected]>
jshaw James Shaw <[email protected]>
mono Ole Loots <[email protected]>
rjw Richard Wilson <[email protected]>
stevef Steve Fryatt <[email protected]>
takkaria Andrew Sidwell <[email protected]>
adamblokus Adam Blokus <[email protected]>
adrianl Adrian Lees <[email protected]>
phlamethrower Jeffrey Lee <[email protected]>
paulblokus Paweł Blokus <[email protected]>
atimmins Andrew Timmins <[email protected]>
dynis Sean Fox <[email protected]>
swdr Sven Weidauer <[email protected]>
struggleyb Bo Yang <[email protected]>
mikeL Mike Lester <[email protected]>
monkeyson Phil Mellor <[email protected]>
philpem Philip Pemberton <[email protected]>
kevinb Kevin Bagust <[email protected]>
MarkieB Mark Benjamin <[email protected]>
rob Rob Jackson <[email protected]>
itix Ilkka Lehtoranta <[email protected]>
matthewh Matthew Hambley <[email protected]>
andrew Andrew Duffell <[email protected]>

Git conversion

Reply via email to