1.First of all make sure you are up to date. Update your working copy of the target branch, ie. where you are merging into. In this example we're working on the trunk of "core" and we want to grab the changes that have happened in the maintenance branch and merge them.
2.Resolve any conflicts. There should be no conflicts at this stage between the working copy and the repository.
3.Select the SVN merge option on the working copy. In Eclipse this is going to be found under the "Team" menu and called "Merge Branch". SVN: Merging in Eclipse
4.Change the From URL to the specific branch you want to be merged into your working copy. In this example we're looking for the p400 maintenance branch (./core/branches/p400).
5.Change the From Revision to the last revision that was merged into the target branch. Essentially you don't want to keep merging the whole branch history, you just want to include those changes since the last time you merged. There is no easy way to determine the last merge point at this time in Subversion. You have to review your message log and look for the last commit that talks about merging. If you are disciplined about the commit messages you use for merging this should be easy (see below). Make a note of what that revision is -- you'll need this later when you commit your changes. SVN: Merge with Eclipse
6.Change the To Revision to the latest (i.e. head). Make a note of what that revision is -- you'll need this later when you commit your changes.
7.Click Merge and wait. Depending on how big the differences are this may be quick or Eclipse my just fall over. If you have such an enormous change that you can't get it done in Eclipse you may need to make the range of revisions you are merging smaller. Or you may even have to skip certain revisions and do them manually if they are massive. We've had this problem from time to time when updating large third-party libraries. The vast majority of the time you will be fine.
8.Review changes and resolve conflicts. Once the merge is complete, look through the changes made to your working copy and make sure you address any conflicts you find.
9.Once all the changes have been resolved in the target working copy, check them in with a single commit. The reason you're not doing lots of commits is that these are changes that should have been documented in the branch from which you merged. The commit message needs to be in a specific format that details the merge and is easy to find in the future. We use the following format, but you can use anything that works for you -- as long as you stick to it.
courtesy : http://stackoverflow.com/questions/3611693/merging-of-branch-to-trunk-in-svn-using-eclipse
Monday, July 9, 2012
Wednesday, June 13, 2012
Outer join vs Not in
Using outer join to find records in table1 which are not in table2
In this case, I have records in table, playdb..pbt_cusip_pool ( with cusips not in mast..sec_mst) and I need to find them. This outer join works better than not in and not exists clauses.
When you do the outer join, it will show everything from the first table, although not matched with the second table, value from the second tbl will be null, and that is what we are tapping into by using where s.cusip = null :) try it out.. this is fun.
select p.cusip, s.cusip from playdb..pbt_cusip_pool p
left outer join mast..sec_mst s
on (p.cusip = s.cusip)
where s.cusip is null
In this case, I have records in table, playdb..pbt_cusip_pool ( with cusips not in mast..sec_mst) and I need to find them. This outer join works better than not in and not exists clauses.
When you do the outer join, it will show everything from the first table, although not matched with the second table, value from the second tbl will be null, and that is what we are tapping into by using where s.cusip = null :) try it out.. this is fun.
select p.cusip, s.cusip from playdb..pbt_cusip_pool p
left outer join mast..sec_mst s
on (p.cusip = s.cusip)
where s.cusip is null
Tuesday, January 31, 2012
Check user sessions in Sybase
Friday, September 23, 2011
Excel remove blank rows
If you have a blank row on every other row in excel, there is an easy way of getting rid of it.
select the entitre column or the range of cells,
hist f5, select special, select blanks and hit okay
now the every blank row will be highlighted.
From the edit menu, select delete. You are all set
select the entitre column or the range of cells,
hist f5, select special, select blanks and hit okay
now the every blank row will be highlighted.
From the edit menu, select delete. You are all set
Friday, March 25, 2011
Perl check for empty string
To check if string is empty (with multiple spaces)
my $product =" ";
if(defined($product) && $product!~( /^\s*$/ )){
print ("This is Not a balnk product");
}else{
print ("This is a balnk product");
}
my $product =" ";
if(defined($product) && $product!~( /^\s*$/ )){
print ("This is Not a balnk product");
}else{
print ("This is a balnk product");
}
Friday, March 18, 2011
All about Heart
All about heart
I have been reading this book called Human Body : Cardovascualr system. This book is basically journey inside your heart. Heart is one most crucial organs of the human body it is the #1 killer in united states.
If you heart cannot function or cannot pump blood, you body will shutdown. Human body is made up of 2 trillion cells and they constantly need
oxygenated blood supply to be able to do their job. This book made so many things clear about heart. You will find fascinating facts about
open heart surgery, bypass graft surgery, Valve replacement, Heart Attack, ECG / EKG, MRI, Arrhythmia, blocked arteries, angiography, Pace makers, ICD's, heart lung machine etc.
Do you know our heart produces electricity (in sinoatrial node).. to make your heart beat..!!! Amaaaaazing..!
Here is some key differences between Pacemakes and ICD's
1. ICDs stay inactive until it detects fibrillation of the heart thus it is activated only in urgent need while the pacemaker can consistently and continuously stimulates the heart electrically to beat in a regular rhythm.
2. Pacemakers are predominantly used to treat slow heart rhythms while ICDs are used for patients who are at risk of sudden cardiac death.
3. ICDs are slightly larger in size, and rather more advanced, compared to pacemakers.
4. Pacemakers aim more to make the patients feel better while ICDs – without bi-ventricular pacing capabilities – will not improve patients’ function because it will only act as protection from sudden cardiac arrest.
I have been reading this book called Human Body : Cardovascualr system. This book is basically journey inside your heart. Heart is one most crucial organs of the human body it is the #1 killer in united states.
If you heart cannot function or cannot pump blood, you body will shutdown. Human body is made up of 2 trillion cells and they constantly need
oxygenated blood supply to be able to do their job. This book made so many things clear about heart. You will find fascinating facts about
open heart surgery, bypass graft surgery, Valve replacement, Heart Attack, ECG / EKG, MRI, Arrhythmia, blocked arteries, angiography, Pace makers, ICD's, heart lung machine etc.
Do you know our heart produces electricity (in sinoatrial node).. to make your heart beat..!!! Amaaaaazing..!
Here is some key differences between Pacemakes and ICD's
1. ICDs stay inactive until it detects fibrillation of the heart thus it is activated only in urgent need while the pacemaker can consistently and continuously stimulates the heart electrically to beat in a regular rhythm.
2. Pacemakers are predominantly used to treat slow heart rhythms while ICDs are used for patients who are at risk of sudden cardiac death.
3. ICDs are slightly larger in size, and rather more advanced, compared to pacemakers.
4. Pacemakers aim more to make the patients feel better while ICDs – without bi-ventricular pacing capabilities – will not improve patients’ function because it will only act as protection from sudden cardiac arrest.
Friday, March 11, 2011
Show hidden files on windows
To see hidden files:
1.
On the Tools menu in Windows Explorer, click Folder Options.
2.
Click the View tab.
3.
Under Hidden files and folders, click Show hidden files and folders.
Note To access Windows Explorer, click Start, point to All Programs, and then click Windows Explorer.
1.
On the Tools menu in Windows Explorer, click Folder Options.
2.
Click the View tab.
3.
Under Hidden files and folders, click Show hidden files and folders.
Note To access Windows Explorer, click Start, point to All Programs, and then click Windows Explorer.
Subscribe to:
Posts (Atom)