[Openbravo-development] Upgrade to Subversion 1.5
Juan Pablo Aroztegi
Subversion 1.5. This new version has improvements over 1.4.x,
specially the merge tracking [1] feature. This means it's no
longer necessary to remember in which revision a branch was made.
An example basic branch/merge work cycle:
1) Create branch:
svn copy https:/dev.openbravo.com/svn/openbravo/trunk https://dev.openbravo.com/svn/openbravo/branches/mybranch -m "My comment about the branch"
2) Edit files and commit in the branch.
3) Merge with trunk in the branch:
svn merge https:/dev.openbravo.com/svn/openbravo/trunk
4) Merge the branch in the trunk:
svn merge --reintegrate https://dev.openbravo.com/svn/branches/mybranch
To benefit from this feature it is necessary to update your SVN client to 1.5:
* Linux and other UNIX users can compile SVN 1.5 from sources or
install the binaries provided by their package manager.
-> Debian: it's already in Sid.
-> FreeBSD: it's already in Ports.
-> Gentoo: it's already in Portage.
-> Ubuntu: there are no 1.5 official debs for Ubuntu yet.
It is possible to use the Debian binaries [2]. Alternatively,
compile it from sources.
* Eclipse users should update Subversive to 0.7.1, or download the new Eclipse
Ganymede.
* Windows users can get the official 1.5 svn client or TortoiseSVN 1.5.0.
Finally, a note for those using the svnmerge.py script: it is no longer
necessary to use it because Subversion 1.5 provides this functionality.
If you previously created a branch with this script, all the properties
have been migrated to the new format, so you can drop it and use "svn
merge" instead. From now on, svnmerge.py *must* not be used in
dev.openbravo.com.
Juan Pablo
[1] http://subversion.tigris.org/merge-tracking/
[2] http://web.loose.cz/deb/
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Openbravo-development mailing list
Openbravo-...@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-development
Jaime Torre
dev.openbravo.com were migrated to version 1.5. The notification made in
that moment [1] explained how to update clients to version 1.5. In that
moment, it was not compulsory to update clients.
Now, commits done from Subversion clients that don't support the new merge
functionality are being rejected. If you try to commit with an
unsupported client, you'll receive the message: "Please only do commits
with a mergeinfo capable client. Currently this means svn-1.5 or later."
If you work from the command line, you just need to upgrade your svn
client. In Ubuntu systems, you'll need to add a repository to your
sources.list:
1. Edit sources.list file:
sudo gedit /etc/apt/sources.list
2. Add the following line:
deb http://ftp.de.debian.org/debian lenny main
3. sudo apt-get update
4. sudo apt-get install subversion
5. To see if SVN 1.5 was installed:
svn --version
6. Edit again sources.list file and comment the previously added line:
# deb http://ftp.de.debian.org/debian lenny main
If you are using Eclipse, you'll have to use Subclipse plugin, as
Subversive plugin does not yet fully support the merge functionality.
Please watch how to uninstall Subversive and how to install Subclipse at
[2].
[1] http://groups.google.com/group/openbravo-development/browse_thread/thread/b2aa7aefe7cf14d6
[2] http://www.dailymotion.com/rafa1080/video/x6a11w_how-to-uninstall-subversive-and-ins_tech
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/