PageRenderTime 79ms CodeModel.GetById 16ms RepoModel.GetById 0ms app.codeStats 0ms

/help/usingversionctrl.htm

http://tfs-shell.googlecode.com/
HTML | 541 lines | 473 code | 67 blank | 1 comment | 0 complexity | 14e711c97dea3dc2625bc4a32e10d04f MD5 | raw file
    

  1. <html DIR="LTR" xmlns:MSHelp="http://msdn.microsoft.com/mshelp" xmlns:ddue="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:tool="http://www.microsoft.com/tooltip"><head><META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=Windows-1252"></META><META NAME="save" CONTENT="history"></META><title>Using Version Control</title><STYLE TYPE="text/css">

    2. 

  2.     body

    3. 

  3.     {

    4. 

  4.         background:    #FFFFFF;

    5. 

  5.         color: #000000;

    6. 

  6.         font-family:    Verdana;

    7. 

  7.         font-size: medium;

    8. 

  8.         font-style: normal;

    9. 

  9.         font-weight: normal;

    10. 

  10.         margin-top:    0;

    11. 

  11.         margin-bottom:    0;

    12. 

  12.         margin-left:    0;

    13. 

  13.         margin-right:    0;

    14. 

  14.         width:    100%;

    15. 

  15.     }

    16. 

  16.     

    17. 

  17.     a

    18. 

  18.     {

    19. 

  19.         color:    #0000FF;

    20. 

  20.     }

    21. 

  21.     

    22. 

  22.     a:visited

    23. 

  23.     {

    24. 

  24.         color:    #0000FF;

    25. 

  25.     }

    26. 

  26.     

    27. 

  27.     a:link

    28. 

  28.     {

    29. 

  29.         color:    #0000FF;

    30. 

  30.     }

    31. 

  31.     

    32. 

  32.     a:hover

    33. 

  33.     {

    34. 

  34.         color:    #FF0000;

    35. 

  35.         cursor: hand;

    36. 

  36.     }

    37. 

  37.     

    38. 

  38.     a:active

    39. 

  39.     {

    40. 

  40.         color:    #FF0000;

    41. 

  41.         cursor: hand;

    42. 

  42.     }

    43. 

  43.     

    44. 

  44.     div#mainSection

    45. 

  45.     {

    46. 

  46.         font-size: 70%;

    47. 

  47.         width: 100%;

    48. 

  48.     }

    49. 

  49.     

    50. 

  50.     div#mainBody

    51. 

  51.     {

    52. 

  52.         font-size: 90%;

    53. 

  53.         margin-left:    5;

    54. 

  54.         margin-top: 10;

    55. 

  55.         padding-bottom: 20;

    56. 

  56.     }

    57. 

  57.     

    58. 

  58.     div#header

    59. 

  59.     {

    60. 

  60.         background-color: #D4DFFF;

    61. 

  61.         padding-top:    0;

    62. 

  62.         padding-bottom:    0;

    63. 

  63.         padding-left:    0;

    64. 

  64.         padding-right:    0;

    65. 

  65.         width:    100%;

    66. 

  66.     }

    67. 

  67.     

    68. 

  68.     div#header table

    69. 

  69.     {

    70. 

  70.         border-bottom-color: #C8CDDE;

    71. 

  71.         border-bottom-style: solid;

    72. 

  72.         border-bottom-width: 1;

    73. 

  73.         width:    100%;

    74. 

  74.     }

    75. 

  75.     

    76. 

  76.     span#runningHeaderText

    77. 

  77.     {

    78. 

  78.         color: #003399;

    79. 

  79.         font-size: 90%;

    80. 

  80.     }

    81. 

  81.     

    82. 

  82.     span#nsrTitle

    83. 

  83.     {

    84. 

  84.         color: #003399;

    85. 

  85.         font-size: 125%;

    86. 

  86.         font-weight: 600;

    87. 

  87.     }

    88. 

  88.     

    89. 

  89.     div#header table td

    90. 

  90.     {

    91. 

  91.         color: #0000FF;

    92. 

  92.         font-size: 70%;

    93. 

  93.         margin-top:    0;

    94. 

  94.         margin-bottom:    0;

    95. 

  95.         padding-right: 20;

    96. 

  96.     }

    97. 

  97.     

    98. 

  98.     div#header table tr#headerTableRow3 td

    99. 

  99.     {

    100. 

  100.         padding-bottom: 2;

    101. 

  101.         padding-top: 5;

    102. 

  102.     }

    103. 

  103.     

    104. 

  104.     div#header table#bottomTable

    105. 

  105.     {

    106. 

  106.         border-top-color: #FFFFFF;

    107. 

  107.         border-top-style: solid;

    108. 

  108.         border-top-width: 1;

    109. 

  109.         text-align: left;

    110. 

  110.     }

    111. 

  111.     

    112. 

  112.     div#footer

    113. 

  113.     {

    114. 

  114.         font-size: 90%;

    115. 

  115.         margin-top:    0;

    116. 

  116.         margin-bottom:    0;

    117. 

  117.         margin-left:    0;

    118. 

  118.         margin-right:    0;

    119. 

  119.         padding-top:    2;

    120. 

  120.         padding-bottom:    2;

    121. 

  121.         padding-left:    2;

    122. 

  122.         padding-right:    2;

    123. 

  123.         width:    100%;

    124. 

  124.     }

    125. 

  125.     

    126. 

  126.     hr#footerHR

    127. 

  127.     {

    128. 

  128.         border-bottom-color: #EEEEFF;

    129. 

  129.         border-bottom-style: solid;

    130. 

  130.         border-bottom-width: 1;

    131. 

  131.         border-top-color: C8CDDE;

    132. 

  132.         border-top-style: solid;

    133. 

  133.         border-top-width: 1;

    134. 

  134.         height: 3;

    135. 

  135.         color: #D4DFFF;

    136. 

  136.     }

    137. 

  137.     

    138. 

  138.     div.section

    139. 

  139.     {

    140. 

  140.         padding-top:    2;

    141. 

  141.         padding-bottom:    2;

    142. 

  142.         padding-left:    16;

    143. 

  143.         padding-right:    15;

    144. 

  144.         width:    100%;

    145. 

  145.     }

    146. 

  146.     

    147. 

  147.     .heading

    148. 

  148.     {

    149. 

  149.         font-weight:    bold;

    150. 

  150.         margin-top:        18;

    151. 

  151.         margin-bottom:    8;

    152. 

  152.     }

    153. 

  153.     

    154. 

  154.     h1.heading

    155. 

  155.     {

    156. 

  156.         color: #003399;

    157. 

  157.         font-size:    125%;

    158. 

  158.     }

    159. 

  159.     

    160. 

  160.     .subHeading

    161. 

  161.     {

    162. 

  162.         font-weight:    bold;

    163. 

  163.         margin-bottom:    4;

    164. 

  164.     }

    165. 

  165.     

    166. 

  166.     h3.subHeading

    167. 

  167.     {

    168. 

  168.         color:  #003399;

    169. 

  169.         font-size: 115%;

    170. 

  170.         font-weight: bold;

    171. 

  171.     }

    172. 

  172.     

    173. 

  173.     h4.subHeading

    174. 

  174.     {

    175. 

  175.         color: #003399;

    176. 

  176.         font-size: 105%;

    177. 

  177.     }

    178. 

  178.     

    179. 

  179.     h5.subHeading

    180. 

  180.     {

    181. 

  181.         color: #003399;

    182. 

  182.         font-size: 100%;

    183. 

  183.     }

    184. 

  184.     

    185. 

  185.     img.toggle

    186. 

  186.     {

    187. 

  187.     	border: 0;

    188. 

  188. 	margin-right: 5;

    189. 

  189.     }

    190. 

  190. 

    191. 

  191.     img.copyCodeImage

    192. 

  192.     {

    193. 

  193. 	border: 0;

    194. 

  194. 	margin-right: 3;

    195. 

  195.     }

    196. 

  196. 

    197. 

  197.     img.downloadCodeImage

    198. 

  198.     {

    199. 

  199. 	border: 0;

    200. 

  200. 	margin-right: 3;

    201. 

  201.     }

    202. 

  202. 

    203. 

  203.     img.viewCodeImage

    204. 

  204.     {

    205. 

  205. 	border: 0;

    206. 

  206. 	margin-right: 3;

    207. 

  207.     }

    208. 

  208. 

    209. 

  209.     img.note

    210. 

  210.     {

    211. 

  211. 	border: 0;

    212. 

  212. 	margin-right: 3;

    213. 

  213.     }

    214. 

  214. 

    215. 

  215.     img#languageFilterImage

    216. 

  216.     {

    217. 

  217. 	border: 0;

    218. 

  218. 	margin-left: 10;

    219. 

  219. 	vertical-align: middle;

    220. 

  220.     }

    221. 

  221. 

    222. 

  222.     img#membersOptionsFilterImage

    223. 

  223.     {

    224. 

  224. 	border: 0;

    225. 

  225. 	margin-left: 10;

    226. 

  226. 	vertical-align: middle;

    227. 

  227.     }

    228. 

  228. 

    229. 

  229.     img#toggleAllImage

    230. 

  230.     {

    231. 

  231. 	margin-left: 4;

    232. 

  232. 	vertical-align: middle;

    233. 

  233.     }

    234. 

  234.     

    235. 

  235.     div#mainSection table

    236. 

  236.     {

    237. 

  237.         border: 0;

    238. 

  238.         font-size: 100%;

    239. 

  239.         width:    100%;

    240. 

  240.     }

    241. 

  241.     

    242. 

  242.     div#mainSection table th

    243. 

  243.     {

    244. 

  244.         background:    #EFEFF7;

    245. 

  245.         border-bottom-color: #C8CDDE;

    246. 

  246.         border-bottom-style: solid;

    247. 

  247.         border-bottom-width: 1;

    248. 

  248.         color: #000066;

    249. 

  249.         padding-left: 5;

    250. 

  250.         padding-right: 5;

    251. 

  251.     }

    252. 

  252.     

    253. 

  253.     div#mainSection table td

    254. 

  254.     {

    255. 

  255.         background:    #F7F7FF;

    256. 

  256.         border-top-color: #FFFFFF;

    257. 

  257.         border-top-style: solid;

    258. 

  258.         border-top-width: 1;

    259. 

  259.         padding-left: 5;

    260. 

  260.         padding-right: 5;

    261. 

  261.     }

    262. 

  262.     

    263. 

  263.     div#mainSection table td.imageCell

    264. 

  264.     {

    265. 

  265.         white-space: nowrap;

    266. 

  266.     }

    267. 

  267.     

    268. 

  268.     div.code table

    269. 

  269.     {

    270. 

  270.         border: 0;

    271. 

  271.         font-size: 95%;

    272. 

  272.         margin-bottom: 5;

    273. 

  273.         width: 100%

    274. 

  274.     }

    275. 

  275.     

    276. 

  276.     div.code table th

    277. 

  277.     {    

    278. 

  278.         background:    #EFEFF7;

    279. 

  279.         border-bottom-color: #C8CDDE;

    280. 

  280.         border-bottom-style: solid;

    281. 

  281.         border-bottom-width: 1;

    282. 

  282.         color: #000066;

    283. 

  283.         font-weight: bold;

    284. 

  284.         padding-left: 5;

    285. 

  285.         padding-right: 5;

    286. 

  286.     }

    287. 

  287.     

    288. 

  288.     div.code table td

    289. 

  289.     {

    290. 

  290.         background:    #F7F7FF;

    291. 

  291.         border-top-color: #FFFFFF;

    292. 

  292.         border-top-style: solid;

    293. 

  293.         border-top-width: 1;

    294. 

  294.         padding-left: 5;

    295. 

  295.         padding-right: 5;

    296. 

  296.         padding-top: 5;

    297. 

  297.     }

    298. 

  298.     

    299. 

  299.     div.alert table

    300. 

  300.     {

    301. 

  301.         border: 0;

    302. 

  302.         font-size: 100%;

    303. 

  303.         width:    100%;

    304. 

  304.     }

    305. 

  305.     

    306. 

  306.     div.alert table th

    307. 

  307.     {

    308. 

  308.         background:    #EFEFF7;

    309. 

  309.         border-bottom-width: 0;

    310. 

  310.         color: #000066;

    311. 

  311.         padding-left: 5;

    312. 

  312.         padding-right: 5;

    313. 

  313.     }

    314. 

  314.     

    315. 

  315.     div.alert table td

    316. 

  316.     {

    317. 

  317.         background:    #F7F7FF;

    318. 

  318.         border-top-color: #FFFFFF;

    319. 

  319.         border-top-style: solid;

    320. 

  320.         border-top-width: 1;

    321. 

  321.         padding-left: 5;

    322. 

  322.         padding-right: 5;

    323. 

  323.     }

    324. 

  324.     

    325. 

  325.     .copyCode

    326. 

  326.     {

    327. 

  327.         color: #0000ff;

    328. 

  328.         font-size: 90%;

    329. 

  329.         font-weight: normal;

    330. 

  330.     }

    331. 

  331.     

    332. 

  332.     .downloadCode

    333. 

  333.     {

    334. 

  334.         color: #0000ff;

    335. 

  335.         font-size: 90%;

    336. 

  336.         font-weight: normal;

    337. 

  337.     }

    338. 

  338.     

    339. 

  339.     .viewCode

    340. 

  340.     {

    341. 

  341.         color: #0000ff;

    342. 

  342.         font-size: 90%;

    343. 

  343.         font-weight: normal;

    344. 

  344.     }

    345. 

  345.     

    346. 

  346.     div.code pre

    347. 

  347.     {

    348. 

  348.         font-family:    Monospace, Courier New, Courier;

    349. 

  349.         font-size: 105%;

    350. 

  350.         color:    #000066;

    351. 

  351.         word-wrap:    break-word;

    352. 

  352.     }

    353. 

  353.     

    354. 

  354.     code

    355. 

  355.     {

    356. 

  356.         font-family:    Monospace, Courier New, Courier;

    357. 

  357.         font-size: 105%;

    358. 

  358.         color:    #000066;

    359. 

  359.     }

    360. 

  360.     

    361. 

  361.     dl

    362. 

  362.     {

    363. 

  363.         margin-top:    0;

    364. 

  364.         padding-left:    1;

    365. 

  365.     }

    366. 

  366.     

    367. 

  367.     dt

    368. 

  368.     {

    369. 

  369.         font-style:    italic;

    370. 

  370.     }

    371. 

  371.     

    372. 

  372.     dd

    373. 

  373.     {

    374. 

  374.         margin-bottom:    0;

    375. 

  375.         margin-left:    0;

    376. 

  376.     }

    377. 

  377.     

    378. 

  378.     ul

    379. 

  379.     {

    380. 

  380.         margin-left: 17;

    381. 

  381.         list-style-type: disc;

    382. 

  382.     }

    383. 

  383.     

    384. 

  384.     ul ul

    385. 

  385.     {

    386. 

  386.         margin-bottom: 4;

    387. 

  387.         margin-left: 17;

    388. 

  388.         margin-top: 3;

    389. 

  389.         list-style-type: disc;

    390. 

  390.     }

    391. 

  391.     

    392. 

  392.     ol

    393. 

  393.     {

    394. 

  394.         margin-left: 24;

    395. 

  395.         list-style-type: decimal;

    396. 

  396.     }

    397. 

  397.     

    398. 

  398.     ol ol

    399. 

  399.     {

    400. 

  400.         margin-bottom: 4;

    401. 

  401.         margin-left: 24;

    402. 

  402.         margin-top: 3;

    403. 

  403.         list-style-type: lower-alpha;

    404. 

  404.     }

    405. 

  405.     

    406. 

  406.     li

    407. 

  407.     {

    408. 

  408.         margin-bottom: 3;

    409. 

  409.     }

    410. 

  410.     

    411. 

  411.     p

    412. 

  412.     {

    413. 

  413.         margin-top: 0;

    414. 

  414.         margin-bottom: 15;

    415. 

  415.     }

    416. 

  416.     

    417. 

  417.     .tip

    418. 

  418.     {

    419. 

  419.         color:    #0000FF;

    420. 

  420.         font-style: italic;

    421. 

  421.         cursor:hand;

    422. 

  422.         text-decoration:underline;

    423. 

  423.     }

    424. 

  424.     

    425. 

  425.     .languageFilter

    426. 

  426.     {

    427. 

  427.         color:    #0000FF;

    428. 

  428.         cursor:hand;

    429. 

  429.         text-decoration:underline;

    430. 

  430.         padding-bottom:4;

    431. 

  431.     }

    432. 

  432.     

    433. 

  433.     .math

    434. 

  434.     {

    435. 

  435.         font-family: Times New Roman;

    436. 

  436.         font-size: 125%

    437. 

  437.     }

    438. 

  438.     

    439. 

  439.     .sourceCodeList

    440. 

  440.     {

    441. 

  441.         font-family: Verdana;

    442. 

  442.         font-size: 90%;    

    443. 

  443.     }

    444. 

  444.     

    445. 

  445.     pre.viewCode

    446. 

  446.     {

    447. 

  447.         width: 100%;

    448. 

  448.         overflow: auto;

    449. 

  449.     }

    450. 

  450.     

    451. 

  451.     MSHelp\:link

    452. 

  452.     {

    453. 

  453.         text-decoration: underline;

    454. 

  454.         color: #0000ff; 

    455. 

  455.         hoverColor: #3366ff;

    456. 

  456.         filterString: ;

    457. 

  457.     }

    458. 

  458. </STYLE>

    459. 

  459. </head>

    460. 

  460. <body><input type="hidden" id="userDataCache" class="userDataStyle"></input><input type="hidden" id="hiddenScrollOffset"></input><img id="dropDownImage" style="display:none; height:0; width:0;" src="drpdown.gif"><img id="dropDownHoverImage" style="display:none; height:0; width:0;" src="drpdown_orange.gif"><img id="collapseImage" style="display:none; height:0; width:0;" src="collapse.gif"><img id="expandImage" style="display:none; height:0; width:0;" src="exp.gif"><img id="copyImage" style="display:none; height:0; width:0;" src="copycode.gif"><img id="copyHoverImage" style="display:none; height:0; width:0;" src="copycodeHighlight.gif"><div id="header"><table width="100%" id="topTable"><tr id="headerTableRow1"><td align="left"><span id="runningHeaderText"></span></td></tr><tr id="headerTableRow2"><td align="left"><span id="nsrTitle">Using Version Control</span></td></tr><tr id="headerTableRow3"></tr></table></div><div id="mainSection"><div id="mainBody"><div id="allHistory" class="saveHistory"></div>

    461. 

  461. 				<p>You use version control in a team development environment to isolate changes, reduce conflicts, and improve the predictability of your development processes. Each developer can make and test code changes on local copies of files before those files are shared with the team. If problems occur, you can easily compare versions of files to isolate the cause of the change and can even roll back changes.</p>

    462. 

  462. 			<h1 class="heading">Common Tasks</h1><div id="sectionSection0" class="section"><content xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5">

    463. 

  463. 					<h3 class="subHeading" xmlns=""></h3><table xmlns=""><tr>

    464. 

  464. 								<th>

    465. 

  465. 									Task

    466. 

  466. 								</th>

    467. 

  467. 								<th>

    468. 

  468. 									Supporting Content

    469. 

  469. 								</th>

    470. 

  470. 							</tr><tr>

    471. 

  471. 							<td>

    472. 

  472. 								<p>

    473. 

  473. 									<b>Understanding version control concepts:</b> When you work with files that are under version control, you work with workspaces for Visual Studio Team Foundation Server

    474. 

  474.  and with changesets. You can use Team Foundation Server

    475. 

  475.  workspaces to manage development of multiple versions of an application at the same time. Changesets are the groups of files and related information that you check in to version control.</p>

    476. 

  476. 							</td>

    477. 

  477. 							<td>

    478. 

  478. 								<ul><li class="unordered">

    479. 

  479. 										

    480. 

  480. 											<a href="workspaces.htm" target="_blank">Working with Team Foundation Server Workspaces</a>

    481. 

  481. 										<br /><br />

    482. 

  482. 									</li><li class="unordered">

    483. 

  483. 										

    484. 

  484. 											<a href="changesets.htm" target="_blank">Working with Changesets</a>

    485. 

  485. 										<br /><br />

    486. 

  486. 									</li></ul>

    487. 

  487. 							</td>

    488. 

  488. 						</tr><tr>

    489. 

  489. 							<td>

    490. 

  490. 								<p>

    491. 

  491. 									<b>Add files to version control:</b> To begin the development lifecycle for a new project, you must add that project to version control to share it with your team.</p>

    492. 

  492. 							</td>

    493. 

  493. 							<td>

    494. 

  494. 								<ul><li class="unordered">

    495. 

  495. 										

    496. 

  496. 											<a href="putundervc.htm" target="_blank">Placing Files under Version Control</a>

    497. 

  497. 										<br /><br />

    498. 

  498. 									</li></ul>

    499. 

  499. 							</td>

    500. 

  500. 						</tr><tr>

    501. 

  501. 							<td>

    502. 

  502. 								<p>

    503. 

  503. 									<b>Get local copies of files:</b> To begin work on a project, you must get a local copy of the files for that project. If you added the project to version control, you might already have those files. You might retrieve the latest version, or you might need to retrieve a previous version to fix a bug in a previous release of the application. To make changes, you must check out files from version control.</p>

    504. 

  504. 							</td>

    505. 

  505. 							<td>

    506. 

  506. 								<ul><li class="unordered">

    507. 

  507. 										

    508. 

  508. 											<a href="getlocalcopy.htm" target="_blank">Getting a Local Copy of Files from the Version Control Server</a>

    509. 

  509. 										<br /><br />

    510. 

  510. 									</li></ul>

    511. 

  511. 							</td>

    512. 

  512. 						</tr><tr>

    513. 

  513. 							<td>

    514. 

  514. 								<p>

    515. 

  515. 									<b>Submit changes:</b> After you make and test your code changes, you must submit them as one or more changesets into version control to make them available to your team. If necessary, you can revert pending changes or roll back changes that you have already submitted to the server.</p>

    516. 

  516. 							</td>

    517. 

  517. 							<td>

    518. 

  518. 								<ul><li class="unordered">

    519. 

  519. 										

    520. 

  520. 											<a href="submitchanges.htm" target="_blank">Submitting and Undoing Pending Changes</a>

    521. 

  521. 										<br /><br />

    522. 

  522. 									</li></ul>

    523. 

  523. 							</td>

    524. 

  524. 						</tr><tr>

    525. 

  525. 							<td>

    526. 

  526. 								<p>

    527. 

  527. 									<b>View changeset history:</b> For any file or folder that is under version control, you can get detailed information about what changes have been made.</p>

    528. 

  528. 							</td>

    529. 

  529. 							<td>

    530. 

  530. 								<ul><li class="unordered">

    531. 

  531. 										

    532. 

  532. 											<a href="versionctrlhistory.htm" target="_blank">Viewing Historical Data for Files under Version Control</a>

    533. 

  533. 										<br /><br />

    534. 

  534. 									</li></ul>

    535. 

  535. 								<p>

    536. 

  536. 								</p>

    537. 

  537. 							</td>

    538. 

  538. 						</tr></table>

    539. 

  539. 				</content></div><h1 class="heading"><span id="seeAlsoNoToggle">See Also</span></h1><div id="seeAlsoSection" class="section"><h4 class="subHeading">Concepts</h4><a href="index.htm" target="_blank">Team Foundation Server Plug-in for Eclipse User Guide</a><br /><br /></div><!--[if gte IE 5]>

    540. 

  540. 			<tool:tip element="seeAlsoToolTip" avoidmouse="false"/><tool:tip element="languageFilterToolTip" avoidmouse="false"/>

    541. 

  541. 		<![endif]--></div><div id="footer"><hr /><p /></div></div></body></html>
    542.