Using Git and SVN at the same time

Bycoliveira

I am a big fan of Git, the distributed source control system created by Linus Torvalds and using on the Linux kernel. The system is really fast, and it is so configurable that it makes life really easy (at least after you learned enough about how it works).

But the reality of the of industry is still very different from what we can do on open source. Companies don’t want a distributed system, because they like to have control of code in a central location. That is why not even Google is using Git these days (they use Perforce, a closed source control system).

The big advantage of Git, however, it that is doesn’t need permission from management to be used in your local machine. And since Git works on a local machine is well as in a server, this is all you need to have a lot of fun.

Playing with Git and Svn

My first try at Git was as a local client for Svn. The general idea is that you can get Git to checkout your project and translate all Svn information into its internal format. That way, you can work with Git locally, and after doing your local development, push the commits to the Svn server.

That worked for me for some time, as I was learned as all pieces worked together. The problem that I had, however, was due to the fact that the Svn importer for Git is not as stable as Svn itself. That is, from time to time there would be some problem in the import/fetch phases, and since you depend on the importer to get anything from Svn, you are in pretty bad shape if that happens.

It also contributed to my problem the fact that my project uses non-standard names for branches, and that they are moved from time to time (don’t ask me why).

I learned the hard way that it maybe easy to use any one of two version control systems, but it is not so easy to mix them…

Trying Git a Second Time

My next try was to use something a little easier. Instead of using Git full time as an svn client, what I do now is to use svn as always (through Tortoise-svn). Then, on top of Svn, I use git to handle changes between Svn commits.

The setup is really easy. The first step is to have a normal Svn tree. Then, use the command

git init

to create a .git directory. Since Git uses only a single directory to hold all its internal information, it will not interfere with the information kept by svn itself in its .svn directories.

Now, I can just hack and commit code on git as I go. Then, when a feature is complete after several small iterations, I can do a Svn commit. I can even decide to spend a long time working on Git, and then go back and make incremental Svn changes. I can also decide to keep hidden branches on Git alone, and merge then only when needed to check in to Svn.

All this can be done without much trouble. The only added work is that I need to do some extra commits to Svn, to make sure that my work is integrated with the other developers, but the fact that everything was ready on Git makes things much easier — I can even use the same summaries.

Conclusion

As any interesting idea, this is one is not new. I just did a quick search on “using git with svn” and found at least another person that uses this idea (see references). Which also means that I am not the craziest developer either.

I am still tweaking my setup with Git and Svn. For example, it is useful to add the .svn directories to .gitignore, as well as other binary files. However, everything has worked Ok, and I feel that this is a good solution for some problems we have when using Svn alone.

References

Related Articles

Similar Posts:

Similar Posts

Day 23: Isolate Code Dependencies

Bycoliveira

It is not a secret to experienced developers that most of the work in modern programming consists of interfacing application code with external libraries. For instance, if you work on application programming (as opposed to system development), there is no reason why you should be required to write another logging package or another data base…

Data Driven Software Design

Bycoliveira

Due to the importance of object oriented design in software engineering, most developers believe that objects are the holy grail of software systems. However, despite the usefulness of interfaces provided by objects, I believe that there is something even more basic that we should look for when designing a system. To see this, we may…

Day 24: Refactoring Code Frequently

Bycoliveira

Software is not a static entity that exists in a single, defined way. The great advantage of software over traditional engineering building material is that it can be modeled for different uses as necessary. This advantage, however, incurs in a penalty that is easily overlooked: it is necessary to maintain software during its life time…

Why GUI Systems are Object Oriented?

Bycoliveira

In the previous post I talked about areas of software development where data is at least as important as behavior in the system design. Object oriented practitioners will contend that behavior is the most natural way of designing a system, and will give a number of examples where it works and the data-centric approach doesn’t….

Avoiding Lengthy C++ Template Instantiations

Bycoliveira

C++ templates are a powerful mechanism that can be used to create generic code. With templates, it is also possible to remove undesirable code duplication, since the same code can then be applied to data of different types. On the flip-side, however, templates can also create problems due to the potential they have to slow…

Day 15: Use Meta Programming When Possible

Bycoliveira

Meta programming is a style of software development where one is able to modify programs automatically, based on rules that have been previously defined in the system. For example, suppose that one wants to create a graphical interface based on simple specifications. The UI code may be written as a complicated C program, which makes…

17 Comments

  1. Carlos,

    Even I started using git on svn the same way. Assuming you have been using this method since long time, let me know if there are any hick-ups you faced.

    I am guessing your answer s gonna be NONE! :)

    Cheers!

  2. Hi Ninad, the only issue is keeping git synchronized. Every time I commit on svn I do the same on git, and use the revision number in the comments to help identify the changes.

  3. Hi Carlos,
    Maybe you can help me in my problem. I wish to use in my projects git and svn together. The reason is complicated. We are making webpages and we have our own cms. Well, each webpage project is different, so I want to store them in SVN version control, in different projects. But each has the cms, with is common, that I want to store in other version control as a self standing project. The cms I would store in GIT.
    My target is, that from any project I have to be able to commit in the repo of the website project and in the repo if the common cms as well.
    Can I do this?

    Thank you very much for your help!

  4. You can always have git along with svn in the same directory, but they won’t be synchronized. Git uses its .git directory, while svn uses the .svn dir. I have done this before, but it would be better to use git as an interface to svn, so that they are synchronized. Try to learn about git-svn and you’ll see how it works.

  6. Pingback: Git + Svn | Git FAQ

  7. Volumptious women wth hube titsYoung gayy boys homoerotic paintingsAdul forums passesAss bbig transexualAnall gspping slutMatre fuckingg free galleryAdult aycare mnReovirus brdast cancerTiia leeoni blw jobBoddy glovess bikiniMomm takoes soon bbig cockGaay churches portland oregonPinkyy
    deepthoat annd faciaal videosLpstick lesbian singlesRestoring vintaye bowsObediient femqle
    ssex slavesStatistics sexx offenderIs mastfurbation healtyhCheerleading com modxel tsen topCumm driking latinasGayy galleries andd
    ggay videosRochester nhh gayHoliday themje pornPeeing annd pooping desprration storiesPlusdh
    swingersZolllo titsSeexy bnnie wrightTripoe
    ppp fisting videoSex chat avenueBurglar bonmdage dreambook storiesHoww
    tto control husbanbds masturbationMarvel aanime pornFossils
    haging sexKongg poww enbter the fistFuckong machiknes
    netHollky weest pictre prn galleryRedtubbe faat miulf housewifeAdulot women punished pictures
    videosBifth conntrol pilols cuse vagginal drynessMenn raised bby nudiat parentDuuchess vintageTeeen dating vioolence articlesNice nipplers cockMaarried woves free pornBag by petunia
    pickole bottomNaked meen indianAsiasn ppin uup girlFetish facebookSexx pictuee glassesJeesse star gayy porn starOrrgasm techinquesVintaage structoJouurnal adult educationMillf homemade pornPh vagina spermMoom boyy sex vidsRodeo cowgirl nakedFitt girls getting fuckedHerr irst lessbian seductionDtas polrn filmMaaria
    eeva sex recordingLesbian ethinic movi freeEducatiol puussy
    picturesBlonde seex iny titVidwo gitls chaning nakedTeen crem queensAdultt free gallery pkst
    thumbhnail videoSeexy modedls inn catfightsFrree full length porn videlsSexxy blonde camTransvestyite grandmotherNudee teenn biCouture juhicy lingerieAccessorry
    carr ebvay mottor part pardt truc vintageShemles suckihg theijr ooun dickFrree gay lockerroo cumHaairy wife orgassm videoHuseband and wikfe sucking cockRiights dwnied
    to homosexualsRotterdam signaturee brteast cancerAhmmo
    hibht resless soups sexx clipsMilff hunfer diaryOlld milfs tube8 videosHoot nude nusist menVirgin vagSexyy slijm wife’s loverMen’s
    sexual experijence iin literatureBooy amateurGayy videos
    persoonal homepagesFreee text ssex stoiresNake husband love videoReal sshort har ssex videosVirtgin island despartment
    off revenueDragg stfrip neqr billingsKinkyy mature sluts nal https://newsexwap.com Digital tomsynthesis breastErottic slavehoood byy chrstian abernathyChjcks jelqig cocksNuude
    lesnians sucking boogs picturesTuurn peenis into a vaginaMicro bikini picsHe gonna kicxk mmy assAsian bitch galleryBotttom
    clening fishStordies swingerr sexAateur caam sput webHeries penisLaady loverss iin latexFreee beautiful nude girlsDemii moore hairty bueh picthre galleryHoot
    cumm bathBroher fucks highh sisyer videoAyson hannning seex videoPradah g gangbangTruee college gqng bangg storiesVintage couar mercuryMirena ssex difficultiesAnimne nymphoo hentaiVintaqge aad 1982 cx500t hondaUk porfn sites ccc billFreee nuhde skinnny sliom
    videoEroti lliterature read onlineDickk fosbury todayYoing teen amature modelsStioll photos twijnk masturbatingLoer abdomminal pain vagiunal bleedingXxxx filthy vidsShhe doesnbt wannt sexSeex and thhe 20 centuryBlwck ebohy teen pics36dd ttits geman teacherLeghal moderll russian teenRusian nude beadh girlsSexy erltic stories freeLewbian trainning pornBigg bedefy hsiry chestsZen asian buffetDanny’s maqle strippers michiganQueder ass folk uk
    seex sceneDooes anal sexx gget pregnantSmall dusl
    action vibratorKaate wknslet seex scene videosMalle brdeast cqncer ductGayy artt gladiatorFreee pucs womern naked
    aand beatCheryl tikegs vintageMatre beazuty fucks pooll guySexual poits oon the penisMeltdown uring
    pornJamws nichol pornMillf raining teensdBobs wearing tube socksArgos sexyEnglsh peee lesbiansChrisetina aglaria seexy picsRejuvwnate facial lotion

  8. Tischspiele können Sie auch spielen, jedoch nur mit 15 % Anrechnung.
    Mit Ihren Bonusguthaben können Sie nicht in Sport, E-Sport, Live-Dealers, TV-BET,
    Insta-Spiele, Crash-Spiele spielen. Sie spielen auch hier
    zuerst mit Ihrem Echtgeld, dann werden auch alle Gewinne dem Bonusguthaben zugeschrieben. Ihre drei ersten Einzahlungen werden gut aufgepeppt
    mit Bonus und Freispielen. Das Bonusangebot habe ich
    ebenfalls im Detail getestet, um herauszufinden, ob
    es wirklich attraktive Vorteile bietet oder nur als Lockmittel
    dient. Wie sind die Bonusbedingungen des Bonusangebots im Bezug auf Roulette?

    Um ein umfassendes Portfolio gewährleisten zu können, bietet
    VulkanSpiele selbstverständlich auch einen eigenen Live-Bereich an. Somit bietet die
    Demoversion nicht nur für Anfänger, die ein neues Spiel kennenlernen wollen, sondern auch für fortgeschrittene Nutzer eine gute Chance, um neue Slots zu
    erleben und dabei qualitativen Spielspaß ohne
    finanzielles Risiko genießen zu können. Dennoch bietet die Demoversion vor allem für neue Nutzer eine gute Gelegenheit,
    sich zunächst mit einem Spiel und dessen Mechanik vertraut machen zu können, ehe das Abenteuer mit echtem Geld beginnen kann.

    Dieses können Sie im Rahmen einer Einzahlung auf Ihr Konto buchen und dabei zudem von spannenden Bonusangeboten profitieren. VulkanSpiele bietet für den Großteil der verfügbaren Slots und Spiele eine Demoversion an.

    References:
    https://online-spielhallen.de/hitnspin-promo-code-2025-bester-bonus-hier-sichern/

  9. Für Anhänger traditioneller Casinounterhaltung hält Interwetten eine solide Auswahl an Tischspielen bereit.
    Wenn du dich entscheidest, um echtes Geld zu spielen, stelle bitte sicher, dass du
    nicht mehr spielst, als du es dir finanziell leisten kannst zu verlieren. Dank seiner Erfahrung und fundierten Kenntnisse in diesen Bereichen liefert er wertvolle Informationen für
    Casinospieler in der Schweiz.
    Ob Tor, Karte, Ecke oder Elfmeter – mit einem Klick setzen Sie
    live auf das nächste Ereignis. Auch kleine Ligen und Nischensportarten finden Beachtung, was Vieltippern und Profis entgegenkommt.

    Nutzer profitieren von stabilen Quoten, einem klaren Interface und der Möglichkeit,
    per Interwetten App jederzeit live zu reagieren.

    References:
    https://online-spielhallen.de/druckgluck-casino-deutschland-alles-was-sie-wissen-mussen/

  10. Pokies are the heart of online gambling in Australia.
    Reliable casinos operating in Australia are usually regulated by respected authorities such as Curaçao eGaming or Malta Gaming Authority.
    Picking the wrong one can mean slow payouts, unclear bonus rules,
    or even unsafe banking. With fast payouts, support that’s available
    day and night, and a licence that adds an extra layer of trust, SkyCrown positions itself
    as a competitive choice in the Aussie iGaming space.

    SkyCrown ticks all these boxes, making it a convenient and
    trustworthy option for real-money play. From licences and payment methods to supported currencies and withdrawal speeds, this
    section covers everything at a glance.
    Skycrown is packed with games — over 6,000 and
    counting. Logging in is simple — one click from sky crown casino online login and you’re ready to grab
    your next promo or spin the reels. New players at Sky Crown Casino get treated
    right from day one. Don’t miss out on your first Skycrown no deposit
    bonus — it’s the perfect way to test the waters before diving into the action. You won’t find it on any official Australian operator list,
    but it’s not blocked either, so players can legally sign up and play at their own discretion.
    Skycrown wants Aussie players to feel like they’re part of something solid.

    Whether you’re a seasoned gambler or new to the scene, the
    app offers everything you need right at your fingertips.
    Add the SkyCrown gambling app shortcut to your browser’s home screen for instant
    access without downloading. Follow these simple steps to install the Sky Crown app and enjoy gaming on the go.
    2025 © skycrown2.casino. SkyCrown Casino may introduce a dedicated mobile app in the future.

    References:
    https://blackcoin.co/welcome-to-paradise-8-casino-au-real-money-pokies-fast-payouts/

  11. And K-Ring (or grid disk) in H3 refers to all hexagonal cells
    within k grid steps from a central cell. Converting a polygon to H3
    indexes involves identifying all hexagonal cells at a specified resolution that fully or partially intersect with the polygon. The hierarchical indexing structure enables multi-resolution analysis through
    parent-child relationships. Each cell undergoes hierarchical subdivision using aperture 7 partitioning, where
    every parent hexagon contains 7 child cells at the next resolution level.

    Unlike geographical distance, it’s a topological
    metric based on hexagonal grid connectivity. Uber H3 is an open-source,
    hexagonal hierarchical spatial indexing system developed by
    Uber. Unlike traditional rectangular grid systems, H3’s hierarchical
    hexagonal tiling ensures uniform spatial coverage,
    better adjacency properties, and reduced distortion.
    To simulate real-world ride data, we generate random GPS coordinates centered around San Francisco.
    This enables spatial queries like “find all cells within a radius of k steps”
    from a target cell. H3 supports hierarchical resolution levels (from 0 to 15), allowing
    data to be indexed at different granularities. Today, H3 is widely used in applications beyond Uber, including environmental monitoring, geospatial analytics, and geographic information systems (GIS).
    It is designed to efficiently partition and index
    geographic space, enabling advanced geospatial analysis, fast queries,
    and seamless visualization. The above query took 1
    seconds compared to 543 seconds which is a significant improvement
    and currently there’s no indexing involved.

    References:
    https://blackcoin.co/fair-go-casino-login-guide/

  12. New online casinos UK are recently launched gambling platforms licensed
    by the UK Gambling Commission. If you like fresh
    design, quick lobbies, and early promos, new online casinos are a good fit.
    If you like quick loading, tidy menus, and a lobby that makes sense on a phone, brand new online casinos are built for that.
    This list of new online casinos is updated for October 2025.
    These are the best new Australian online casinos for
    2025 with clean mobile lobbies, AUD banking, and payout
    steps that make sense.
    While some people like to stick to their pokies, sometimes mixing and
    matching different games together can be just what the doctor ordered!
    Below, we have listed a small assortment of specific online pokies and all kinds of online gambling Australia types that you might want to try one of
    these days. This is why it is smart to pounce on amazing new bonuses
    whenever you see some of them available. However, it is worth noting that veteran casinos may also
    do this in order to stay relevant. In the end,
    it is a good idea to carefully consider both the pros and cons listed
    above before choosing to play at a new casino.
    There is no denying that all of this contributes to a positive gaming experience.

    It also meant that a number of popular online casinos could no longer
    operate for the people who frequently used them. November 2014 marked a dramatic shift in the way that online casinos were required to operate,
    as well as the way they were regulated. This ambition is what led us
    to create this resource showing the latest and
    greatest list of the best new casino sites with bonuses and spins laid
    out in plain English. Our goal was to try and make life easy for our
    fellow Db’ers and help you find an establishment that is both accredited and licenced
    to let you play online in the UK whilst offering the highest level of security and
    a wide array of features and bonuses.

  13. Dealers are professional, and you can chat with them in real-time.
    Jet4Bet Casino’s touch-friendly interface made betting on sports or spinning pokies a breeze.

    These perks add value but check if they’re worth the wagering requirements.A great mobile casino feels seamless.
    Focus on low-wagering offers (under 35x) for better
    cashout chances.Gambling should be fun, not a problem. This keeps gambling fun and
    prevents chasing losses, which is a big risk.Bonuses sound great, but terms
    can trip you up.
    A $1,000 bonus with 40x wagering means you must bet $40,000 before withdrawing winnings.Jackpot Jill Casino’s bonuses
    have clear terms but always read the fine print.
    I never bet more than 5% of my bankroll on a single game, whether at Wolf Winner Casino or elsewhere.Split your funds
    into sessions say, $100 for a week and stop when it’s gone.
    Check game info before playing Joka Casino lists
    RTPs clearly.
    Boho Casino’s live gaming suite, featuring over 760 options, brings the thrill of a real
    casino into the comfort of your home. To ensure a safe online gambling experience, always choose licensed casinos, use secure
    payment methods, and take advantage of responsible gambling
    tools. These state-specific regulations ensure that online gambling activities are conducted
    within a legal framework, providing additional protection for players.
    Each Australian state has distinct laws governing
    online gambling, so players must understand their local regulations.

    Clear communication about transaction times, fees, and limits ensures
    player satisfaction for those with an online casino account.
    A diverse game library is essential for a fulfilling
    online casino experience.

Leave a Reply

Your email address will not be published. Required fields are marked *

This site uses Akismet to reduce spam. Learn how your comment data is processed.