Linux - SVN Updating, Commiting file

Goto directory you want to update the file of...
cd path/tot/direcoty
Best is to get status for the current diroctory from svn server first..
svn status
it will list you if there is any update made in the directory to any file

if you find any update, you may need to impliment that to your machine first
$ svn update
A newdir/toggle.c
A newdir/disclose.c
A newdir/launch.c
D newdir/README
Updated to revision 32.
For aabriviation...
A Added
D Deleted
U Updated
C Conflict
G Merged
if you find a conflict you may find following..
$ svn update
Conflict discovered in 'template.php'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C template.php
Updated to revision 4880.
Summary of conflicts:
Text conflicts: 1
There is one text conflict.. you can open it in netbeans to see diff.

Next you can update svn server for the file you made changes on..
svn commit filenam.xyz -m"Any Comment"

Comments

Post a Comment

Popular posts from this blog

How to Reset Root Password in Drupal 7 with phpMyAdmin

Image
Copy the hash.. $S$C6x2r.aW5Nkg7st6/u.IKWjTerHXscjPtu4spwhCVZlP89UKcbb/ (that’s the hash for newPassword ).   Navigate to your phpMyAdmin (likely in your control panel online somewhere). Then browse the User table for the Root user, look like his. Take the copied hashed text and paste it into the pass field of the Root user and hit “Go”. See this If you want to reset Drupal pasword using Drush .
Read more

Syntax Highlighting with Blogger Engine

I was trying to style the code snippets highlighted as code as developer in my blog. Did it using some custom css but no positive impression. Recently googling, found an article abt that here . This can be done using syntaxhiglighter . Drop this code right before your </head> tag... and save. And here is the way how you can use it. 1. Using <script> tag with CDATA This will output.... // Commenting this function function custom_one($var) { if($one == $two) { $three = array( 'one', 'two' ); } } 2. Using the <pre> tag. // Commenting this function function custom_one($var) { if($one == $two) { $three = array( 'one', 'two' ); } } This will output.... // Commenting this function function custom_one($var) { if($one == $two) { $three = array( 'one', 'two' ); } }
Read more