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

Drupal - Hiding field group and its Children

It came to me when I was trying to hide field_group on account page. Searching on I found the following solution using hook_form_alter // Comment /** * Implements hook_form_FORM_ID_alter(). */ function MODULE_form_node_form_alter(&$form, &$form_state) { global $user; // The 'internal' field groups should only be accessible for regional administrators. if (!in_array('regional administrator', $user->roles)) { foreach (array('group_action_internal', 'group_company_internal', 'group_topic_internal') as $fieldgroup) { if (isset($form['#fieldgroups'][$fieldgroup]) && isset($form['#group_children'])) { // Hide the field group itself. $form['#fieldgroups'][$fieldgroup]->format_type = 'hidden'; // Hide the elements inside the field group. foreach ($form['#group_children'] as $field => $group) { if ($group == $fieldgroup) {
Read more