Source control: Difference between revisions

From Valve Developer Community
Jump to navigation Jump to search
mNo edit summary
mNo edit summary
 
(11 intermediate revisions by 8 users not shown)
Line 1: Line 1:
[http://sings.servemp3.com/article/jab-archives.html jab archives] [http://marts.servemp3.com/confederate.html confederate] [http://array.servemp3.com/akt.html akt] [http://pours.servemp3.com/data/thank-you-notes.html thank you notes] [http://pittie.servemp3.com/styles/kc-royals.htm kc royals] [http://topas.servemp3.com/data/ava-fabian.html ava fabian] [http://marts.servemp3.com/recipescom.html recipes.com] [http://marts.servemp3.com/curriculum-vitae.html curriculum vitae] [http://sizzle.servemp3.com/kit-homes.html kit homes] [http://sings.servemp3.com/article/dog-obedience.html dog obedience training] [http://sings.servemp3.com/article/td-bank.html td bank] [http://sizzle.servemp3.com/star-wars-cantina.html star wars cantina] [http://pittie.servemp3.com/styles/hawaiian-names.htm hawaiian names] [http://sizzle.servemp3.com/blue-prints.html blue prints] [http://endure.servemp3.com/perch.html perch] [http://pittie.servemp3.com/styles/chimerism.htm chimerism] [http://marts.servemp3.com/doa-tina.html doa tina] [http://topas.servemp3.com/data/ugg.html ugg] [http://topas.servemp3.com/data/zina.html zina] [http://sings.servemp3.com/article/banshee.html banshee] [http://pittie.servemp3.com/styles/why-do-you-love.htm why do you love me] [http://swung.servemp3.com/topic/pet-health.html pet health] [http://swung.servemp3.com/topic/debenhams.html debenhams] [http://endure.servemp3.com/lolly.html lolly] [http://endure.servemp3.com/solar-water-heater.html solar water heater] [http://winged.servemp3.com/pages/missouri-state.htm missouri state parks] [http://sings.servemp3.com/article/taxi-driver.html taxi driver] [http://pittie.servemp3.com/styles/factoring-financial.htm factoring financial services] [http://marts.servemp3.com/strategic-internet.html strategic internet marketing] [http://topas.servemp3.com/data/fashion-model.html fashion model] [http://marts.servemp3.com/anthony-robbins.html anthony robbins] [http://winged.servemp3.com/pages/chair.htm chair] [http://winged.servemp3.com/pages/jack-russel.htm jack russel] [http://marts.servemp3.com/har.html har] [http://swung.servemp3.com/topic/the-lost-world.html the lost world] [http://array.servemp3.com/labrador.html labrador] [http://winged.servemp3.com/pages/cuban-flag.htm cuban flag] [http://sings.servemp3.com/article/doom3.html doom3] [http://endure.servemp3.com/payment-calculator.html payment calculator] [http://pours.servemp3.com/data/penicillin.html penicillin] [http://sings.servemp3.com/article/fantasy-fairies.html fantasy fairies] [http://topas.servemp3.com/data/coffee-makers.html coffee makers] [http://winged.servemp3.com/pages/personalized-baby.htm personalized baby gifts] [http://winged.servemp3.com/pages/dog-lovers.htm dog lovers] [http://sings.servemp3.com/article/jessica-simpson.html jessica simpson pictures] [http://swung.servemp3.com/topic/jjj-thumbnail-gallery.html jjj thumbnail gallery] [http://swung.servemp3.com/topic/tyco.html tyco] [http://topas.servemp3.com/data/computer-jobs.html computer jobs] [http://array.servemp3.com/george-mikan.html george mikan] [http://winged.servemp3.com/pages/much-music.htm much music] [http://pittie.servemp3.com/styles/picket-fences.htm picket fences] [http://endure.servemp3.com/coloring-pages.html coloring pages for kids] [http://endure.servemp3.com/movie-phone.html movie phone] [http://sizzle.servemp3.com/kenny-rogers.html kenny rogers] [http://sizzle.servemp3.com/eminem-lyrics.html eminem lyrics] [http://topas.servemp3.com/data/jesus-on-the-cross.html jesus on the cross] [http://array.servemp3.com/come-on.html come on] [http://topas.servemp3.com/data/dictionarycom.html dictionary.com] [http://endure.servemp3.com/nami-one-piece.html nami one piece] [http://pittie.servemp3.com/styles/fallen.htm fallen] [http://topas.servemp3.com/data/kingdom-hearts-mp3.html kingdom hearts mp3] [http://topas.servemp3.com/data/taint.html taint] [http://array.servemp3.com/marine-radio.html marine radio] [http://winged.servemp3.com/pages/payday-loan.htm payday loan] [http://pours.servemp3.com/data/bold.html bold] [http://marts.servemp3.com/amex.html amex] [http://array.servemp3.com/original-oil-paintings.html original oil paintings] [http://pours.servemp3.com/data/nissan-trucks.html nissan trucks] [http://sizzle.servemp3.com/phoenix-apartments.html phoenix apartments] [http://sizzle.servemp3.com/cheap-international.html cheap international calls] [http://topas.servemp3.com/data/orchid-care.html orchid care] [http://swung.servemp3.com/topic/lazy-susan.html lazy susan] [http://sizzle.servemp3.com/vertex.html vertex] [http://endure.servemp3.com/nak.html nak] [http://endure.servemp3.com/naturalcurescom.html naturalcures.com] [http://endure.servemp3.com/treatment-fibromyalgia.html treatment fibromyalgia] [http://topas.servemp3.com/data/oceans.html oceans] [http://winged.servemp3.com/pages/direcway.htm direcway] [http://sings.servemp3.com/article/wireless-microphones.html wireless microphones] [http://winged.servemp3.com/pages/elena-anaya.htm elena anaya] [http://winged.servemp3.com/pages/aunt.htm aunt] [http://sizzle.servemp3.com/powerpoint-animations.html powerpoint animations] [http://pours.servemp3.com/data/satellite-photos.html satellite photos] [http://marts.servemp3.com/zyvox.html zyvox] [http://sizzle.servemp3.com/alien-song.html alien song] [http://array.servemp3.com/procrastination.html procrastination] [http://swung.servemp3.com/topic/renters-insurance.html renters insurance] [http://sizzle.servemp3.com/spitalfield.html spitalfield] [http://pittie.servemp3.com/styles/rick-james.htm rick james] [http://winged.servemp3.com/pages/sedll.htm se.dll] [http://topas.servemp3.com/data/cabinet-doors.html cabinet doors] [http://pours.servemp3.com/data/overkill.html overkill] [http://endure.servemp3.com/myfloridacom.html myflorida.com] [http://pours.servemp3.com/data/grizzly-bear.html grizzly bear] [http://pours.servemp3.com/data/microsoft-project.html microsoft project 2003 serial] [http://topas.servemp3.com/data/free-video-poker.html free video poker] [http://endure.servemp3.com/the-pink-panther.html the pink panther] [http://marts.servemp3.com/witch-craft.html witch craft] [http://array.servemp3.com/generic-viagra.html generic viagra] [http://swung.servemp3.com/topic/first-home-mortgage.html first home mortgage]
{{DISPLAYTITLE:Introduction to Source Control}}
{{Stub}}
[http://en.wikipedia.org/wiki/Revision_control Source control] refers to a
management system that helps control how information changes. For example, a
source control system might be used in a software project to help mitigate some
of the hazards of having developers work in parallel or to provide easy
roll-back and branching functionality (for when development decides to go in
another direction).


Source control is a process where different versions of code are merged into a single codebase.  
 
The remainder of this article gives a brief introduction to source control and
talks a little about the Source SDK relevant issues.
 
 
== Overview ==
 
A software source control system will typically manage a collection of files and
directories, which we will call ''items''. It often associates such a
collection with something called a ''repository''. You can think of a repository
as something like a warehouse where all your code is "bagged-and-tagged".
 
 
As a user makes changes, such as adding, removing, and modifying items, the
system will monitor the changes and provide this information in a ''status''
report. When a user is satisfied with the changes they have made and with the
status, they can ''commit'' their changes to the repository. A user will
typically provide a short description of the collection of changes that they are
committing during the commit process. These messages, along with their
corresponding ''revision numbers'', can be viewed in the repository's ''log''.
 
 
Revision numbers provide an easy way to refer to the repository at an earlier
point in time. The repository can be restored to an earlier revision, called a
''roll-back''. A separate path of development can be created in the same
repository at a given revision, called a ''branch''. Branches can be
consolidated together or with a central development ''trunk'' by ''merging''
them. A repository can be copied and made independent up to a given revision,
called a ''fork''. Also, differences in files can be inspected by referencing
revision numbers.
 
== Technology ==
 
Common systems today operate in a client-server or peer-to-peer way. These
systems typically provide networked functionality. Many may also be operated
offline and/or in a completely local capacity. Local only solutions do exist,
though the core technology is typically older. For more detail, see
[http://en.wikipedia.org/wiki/Revision_control wikipedia].
 
 
== Source SDK ==
 
Valve will periodically update the Source SDK code base. This may or may not
introduce conflicts with mod projects that have already modified code that
was updated. Source control doesn't make these conflicts magically disappear,
but they do provide a powerful way to deal with these issues in a safe and
controlled manner.
 
 
<u>'''It is strongly recommended and encouraged that mod developers use source control in their projects.'''</u>
 
 
Valve uses Perforce as their source control solution. Other common solutions are Git, Hg (Mercurial), and SVN (Subversion), just to name a few. The
following are more detailed articles on using a particular source control
technology to manage a Source SDK project.
 
 
=== Getting Started ===
 
* [[Using Source Control with the Source SDK|Using Perforce for Source Control with the Source SDK]] (This is the original getting started guide)
* [[Using Subversion for Source Control with the Source SDK]]
* [[Using Git for Source Control with the Source SDK]]


== See also ==
== See also ==
* [[Diff And Patch]]
* [[Diff And Patch]]
* [[Using Source Control with the Source SDK]]


[[Category:Glossary]]
 
[[Category:Programming]]
<!-- This comment is 80 characters wide. -------------------------------------->

Latest revision as of 16:22, 10 April 2023

Source control refers to a management system that helps control how information changes. For example, a source control system might be used in a software project to help mitigate some of the hazards of having developers work in parallel or to provide easy roll-back and branching functionality (for when development decides to go in another direction).


The remainder of this article gives a brief introduction to source control and talks a little about the Source SDK relevant issues.


Overview

A software source control system will typically manage a collection of files and directories, which we will call items. It often associates such a collection with something called a repository. You can think of a repository as something like a warehouse where all your code is "bagged-and-tagged".


As a user makes changes, such as adding, removing, and modifying items, the system will monitor the changes and provide this information in a status report. When a user is satisfied with the changes they have made and with the status, they can commit their changes to the repository. A user will typically provide a short description of the collection of changes that they are committing during the commit process. These messages, along with their corresponding revision numbers, can be viewed in the repository's log.


Revision numbers provide an easy way to refer to the repository at an earlier point in time. The repository can be restored to an earlier revision, called a roll-back. A separate path of development can be created in the same repository at a given revision, called a branch. Branches can be consolidated together or with a central development trunk by merging them. A repository can be copied and made independent up to a given revision, called a fork. Also, differences in files can be inspected by referencing revision numbers.

Technology

Common systems today operate in a client-server or peer-to-peer way. These systems typically provide networked functionality. Many may also be operated offline and/or in a completely local capacity. Local only solutions do exist, though the core technology is typically older. For more detail, see wikipedia.


Source SDK

Valve will periodically update the Source SDK code base. This may or may not introduce conflicts with mod projects that have already modified code that was updated. Source control doesn't make these conflicts magically disappear, but they do provide a powerful way to deal with these issues in a safe and controlled manner.


It is strongly recommended and encouraged that mod developers use source control in their projects.


Valve uses Perforce as their source control solution. Other common solutions are Git, Hg (Mercurial), and SVN (Subversion), just to name a few. The following are more detailed articles on using a particular source control technology to manage a Source SDK project.


Getting Started

See also