Tag: integration

Posted on

Delete the merge info, when problems with integration

Real World Fix (See below for original email with details)

Three steps to accomplish the task, the first one shows you are in the right place, the second actually deletes all merge info and the final step reverts back the merge info for the root folder:

Use this to see if there is a problem:

svn propget -R svn:mergeinfo .

And then the following to fix it:

[~/tmp/trunk]$  svn status
[~/tmp/trunk]$  svn propdel svn:mergeinfo -R .
[~/tmp/trunk]$  svn revert .

Example:

svn pd svn:mergeinfo halwebsite/js/jquery/date.js

From subversion Wiki:

Reintegration Problem

At certain times, you get the following error, even though you have merged trunk changes to branch:

svn: Cannot reintegrate from 'https://some.server/branches/branch' yet:
Some revisions have been merged under it that have not been merged into the reintegration target; merge them first, then retry.

Older versions of subversion seem to cause mergeinfo problems with mergeinfo properties for individual files. This problem can be detected by recursively listing properties in the branch:

svn pl -R $SVN/branches/branch/|egrep -B 4 svn:mergeinfo

If individual files and subdirectories have mergeinfos, you can delete them:

svn pd -R svn:mergeinfo branch/subdirectory_with_mergeinfo/

and commit the changes.

-----Original Message-----
From: Guillaume Radde [mailto:guillaume.radde@redhat.com]
Sent: Tuesday, July 10, 2012 9:26 AM
To: Ruckman, Maurice (HAL)
Cc: Fillman, Eric (HAL); Thompson, Sonya (HAL)
Subject: Deleting mergeinfo

To delete svn:mergeinfo from all files and folder except the parent folder:

-----------------------------------------------------------------
[jboss1@haldevjbs05 ~/tmp/trunk]$  svn status
[jboss1@haldevjbs05 ~/tmp/trunk]$  svn propdel svn:mergeinfo -R .
property 'svn:mergeinfo' deleted from '.'.
property 'svn:mergeinfo' deleted from 'hal-ejb/src/main/java/com/sbn/shx/util/SbnShxIconUtil.java'.
svn: Attempting to delete nonexistent property 'svn:mergeinfo'
[jboss1@haldevjbs05 ~/tmp/trunk]$  svn revert .
Reverted '.'
[jboss1@haldevjbs05 ~/tmp/trunk]$  svn status
M      hal-ejb/src/main/java/com/sbn/shx/util/SbnShxIconUtil.java
[jboss1@haldevjbs05 ~/tmp/trunk]$
-----------------------------------------------------------------

-------------------------------------
Guillaume Radde
Senior Consultant, Red Hat Consulting
guillaume.radde@redhat.com
http://www.redhat.com
-------------------------------------

Posted on

Integrate Merge / Commits with Jira

-----Original Message-----
From: Guillaume Radde [mailto:guillaume.radde@redhat.com]
Sent: Thursday, April 12, 2012 12:24 PM
To: Mirza, Masood (HAL Contractor); Thompson, Sonya (HAL); Doan, Thomas (HAL Contractor); zzSmith, Robert (HAL Contractor); Ruckman, Maurice (HAL); Phatak, Sheetal (HAL); Bojja, Sridhar (HAL Contractor); Fillman, Eric (HAL); Augustine, Anila (HAL)
Subject: Jira-Subversion integration

You may have noticed that in Jira tickets, there is a tab at the bottom of the page that says "Subversion Commits". You can attach a commit to a Jira ticket by putting the Jira ticket number in the commit message.

Example:

$ svn commit -m "Remove duplicated method declaration. Fix JBM-319"

And the created commit will be added to the Jira ticket JBM-319.

Jira parses subversion commit logs every hours looking for Issue numbers so it's normal if you don't see your commit right away.

-------------------------------------
Guillaume Radde
Senior Consultant, Red Hat Consulting
guillaume.radde@redhat.com
http://www.redhat.com_o<
-------------------------------------

-----Original Message-----
From: Guillaume Radde [mailto:guillaume.radde@redhat.com]
Sent: Thursday, April 12, 2012 12:24 PM
To: Mirza, Masood (HAL Contractor); Thompson, Sonya (HAL); Doan, Thomas (HAL Contractor); zzSmith, Robert (HAL Contractor); Ruckman, Maurice (HAL); Phatak, Sheetal (HAL); Bojja, Sridhar (HAL Contractor); Fillman, Eric (HAL); Augustine, Anila (HAL)
Subject: Jira-Subversion integration

You may have noticed that in Jira tickets, there is a tab at the bottom of the page that says "Subversion Commits". You can attach a commit to a Jira ticket by putting the Jira ticket number in the commit message.

Example:

$ svn commit -m "Remove duplicated method declaration. Fix JBM-319"

And the created commit will be added to the Jira ticket JBM-319.

Jira parses subversion commit logs every hours looking for Issue numbers so it's normal if you don't see your commit right away.

-------------------------------------
Guillaume Radde
Senior Consultant, Red Hat Consulting
guillaume.radde@redhat.com
http://www.redhat.com_o<
-------------------------------------
-----Original Message-----
From: Guillaume Radde [mailto:guillaume.radde@redhat.com]
Sent: Thursday, April 12, 2012 12:24 PM
To: Mirza, Masood (HAL Contractor); Thompson, Sonya (HAL); Doan, Thomas (HAL Contractor); zzSmith, Robert (HAL Contractor); Ruckman, Maurice (HAL); Phatak, Sheetal (HAL); Bojja, Sridhar (HAL Contractor); Fillman, Eric (HAL); Augustine, Anila (HAL)
Subject: Jira-Subversion integration

You may have noticed that in Jira tickets, there is a tab at the bottom of the page that says "Subversion Commits". You can attach a commit to a Jira ticket by putting the Jira ticket number in the commit message.

Example:

$ svn commit -m "Remove duplicated method declaration. Fix JBM-319"

And the created commit will be added to the Jira ticket JBM-319.

Jira parses subversion commit logs every hours looking for Issue numbers so it's normal if you don't see your commit right away.

-------------------------------------
Guillaume Radde
Senior Consultant, Red Hat Consulting
guillaume.radde@redhat.com
http://www.redhat.com_o<
-------------------------------------