Warning: This page has not been updated in over over a year and may be outdated or deprecated.
legacy:vufind_1.x_developer_manual:subversion
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
subversion [2010/11/30 20:14] – demiankatz | subversion [2011/04/26 12:55] – demiankatz | ||
---|---|---|---|
Line 46: | Line 46: | ||
To get started, there two possible approaches: | To get started, there two possible approaches: | ||
+ | |||
+ | |||
+ | |||
Line 56: | Line 59: | ||
* 5.) Merge “vendor” into “trunk.” | * 5.) Merge “vendor” into “trunk.” | ||
- | Sample commands to upgrade VuFind 1.0 to current trunk (assumes that you start out in an appropriate SVN working directory): | + | Sample commands to upgrade VuFind 1.0 to current trunk (assumes that you start out in an appropriate SVN working directory |
< | < | ||
Line 80: | Line 83: | ||
svn commit -m" | svn commit -m" | ||
- | # Merge new changes into trunk (note that if this is not a fresh repository, you may need to replace " | + | # Merge new changes into trunk (note that if this is not a fresh repository, you may |
+ | # need to replace " | ||
svn merge vendor@1 vendor@HEAD trunk | svn merge vendor@1 vendor@HEAD trunk | ||
+ | svn commit -m" | ||
</ | </ | ||
Line 98: | Line 103: | ||
Regardless of which approach you take, once you are done, you are all set to begin using the [[subversion# | Regardless of which approach you take, once you are done, you are all set to begin using the [[subversion# | ||
+ | |||
+ | ===== Using Git ===== | ||
+ | |||
+ | Some developers prefer [[http:// | ||
---- struct data ---- | ---- struct data ---- | ||
---- | ---- | ||
legacy/vufind_1.x_developer_manual/subversion.txt · Last modified: 2018/12/19 15:00 by demiankatz