Author: Maurice Ruckman

Posted on

Merging from a revision

Example that wants just what was done in revision 2723 in trunk:

svn merge -c [good_revision] [repository_url]
svn merge -c 2723 http://halsvn01/svn/hal/trunk

This will rollback revision 2723 in trunk, pay attention to the negative sign in front of the revision number:

svn merge -c -[bad_revision] [repository_url]
svn merge -c -2723 http://halsvn01/svn/hal/trunk

Older methods as show by Guillaume below, the one above are now supported and recommended by me.

svn merge ~/branches/features/your-feature-t0-merge-no-ending-slash -r 995:999

Where 995 represent the first revision and 999 represents the last revision to merge

$ svn merge -c 614 https://secreturl/trunk or $ svn merge -r 613:614 https://secreturl/trunk.

The first means apply changes in revision 614 only, while the second form means take all changes required to go from r613 to r614 and apply them here.

Posted on

Looking at Linux history

Hit [Ctrl]+[R] and then start type and it will find history that matches that string

Hit [Ctrl]+[R] again to cycle through your subset to find an entry

Posted on

Subversion Maintenance – Adding Users

1. SSH to the subversion server
Putty to halsvn01.hq.halw.com

sudo to root:
The Unix team added sudoers file for mlr, ezf, and sst to be able to do the following, additional users would needed added by Unix team:

sudo /usr/bin/htpasswd -m /etc/httpd/conf/.htaccess
sudo /bin/vi /etc/httpd/conf/svn_acl
sudo /usr/bin/vim /etc/httpd/conf/svn_acl

originally Guillaume used:
sudo su -

2. Edit the configuration files

The following will allow you to enter the user's password:

cd /etc/httpd/conf
ls -la
htpasswd -m /etc/httpd/conf/.htaccess user-account

The following will allow defines access control in subversion:
vim svn_acl

vim command
[Esc] [:] [q] to quit without saving
[Esc] [:] "wq" to write (save) and quit

[i] - Insert

You will change users in groups which propagate down through the rest of the script, here's the start of the script:

[groups]

## For HAL
#developers
dev = aja, szb, ezf, sst, mlr, sxp, kxs, wgh, mad, mwm, c-rgong, c-rsmith, jeff, c-rradhakrishnan, jay, guillaume, c-mhartman, c-fcastro, c-dgreca, @rm, @rev, @qa

Posted on

Searching for files

Use the attached Perl script in conjunction with the following example bash command:

for i in `perl findfiles.pl /home/jboss1/workspace_maven/hal-parent/hal-web/ .jsp`; do grep -il 'look for something'  $i; done

findfiles.pl (txt)

Posted on

Cloning a VM Fixes

We had two configuration files that required changes after Brian received a cloned VM.  The haldevjbs04 (source) was changed to haldevjbs06 (target) and all was good again.

/etc/httpd/conf/httpd.conf
/etc/httpd/conf/workers.properties

Subversion folder needs deleted:
/home/jboss1/.subversion

Also, browser settings are copied too.

You should no longer have either of the following cron jobs running:

rm /etc/cron.hourly/jboss-config
rm /etc/cron.hourly/svn-update