[jbosstools-dev] Re: 2.0.x branch is now in effect

[Max Rydahl Andersen]

fyi: I setup svnmerge.py (http://www.orcaware.com/svn/wiki/Svnmerge.py) on this branch and merged over the revisions that Denis did after the branch were done plus I blocked the 2.1 fixes mareshkau did today. 

That was really a piece of cake ;) svnmerge.py rocks and I really encourage you to take a look on the above wiki page to understand how it works and use it when you need to merge work.

It also makes it even more important to try and commit work for an issue in *one* commit instead of several small ones because it makes it much easier to manage the branches.

for those intersted here is what I did to prepare and sync up the current commits (note: Since noone changed much I could do the commit directly, but of course when we go forward you will have to verify if the merged over files also works in the merged to branch):

% svnmerge.py init
property 'svnmerge-integrated' set on '.'

% svnmerge.py avail
6137-6148

% svn ci -F svnmerge-commit-message.txt
Sending        .

Committed revision 6149.
% svnmerge.py merge -r6137-6142
U    hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java
U    hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/HibernateConsoleTest.java
U    hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java
U    seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
U    vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java
U    vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java
U    vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/view/XulRunnerView.java
U    jst/plugins/org.jboss.tools.jst.web/resources/meta/web.meta

property 'svnmerge-integrated' set on '.'

% svn ci -F svnmerge-commit-message.txt
Sending        .
Sending        hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java
Sending        hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/HibernateConsoleTest.java
Sending        hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java
Sending        jst/plugins/org.jboss.tools.jst.web/resources/meta/web.meta
Sending        seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Sending        vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java
Sending        vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java
Sending        vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/view/XulRunnerView.java
Transmitting file data ........
Committed revision 6150.
% svnmerge.py block -r6143-6146
property 'svnmerge-blocked' set on '.'

% svn ci -F svnmerge-commit-message.txt
Sending        .

Committed revision 6151.
% svnmerge.py avail
6147-6148

That last svnmege.py avail is two commits in the docs which I did not merge over.

/max




> Hi,
>
> If you did not see it already then we branched last night.
>
> https://svn.jboss.org/repos/jbosstools/trunk is now for new development (e.g. 2.1 tasks).
>
> https://svn.jboss.org/repos/jbosstools/branches/jbosstools-2.0.x is where we will create 2.0.1 from
> in the upcoming days.
>
> This means if you are fixing things for 2.0.1 you should commit it to *both* branches!
>
> Marshall - could you please post the url where jbosstools 2.0.x builds can be downloaded from so QA can use those ?
> 
> /max
>
> 



-- 
Using Opera's revolutionary e-mail client: http://www.opera.com/mail/