[Building Sakai] Subversion upgrade

Wed Sep 23 07:24:56 PDT 2009

In case you have not been tracking subversion development over the past few years, some significant functionality has been added which I will try to highlight.  IMHO, the most important change for Sakai is the merge tracking capabilities.  I would suggest that anyone performing merges on a regular basis become with these new time-saving features.  Best, L

http://subversion.tigris.org/svn_1.6_releasenotes.html

<http://subversion.tigris.org/svn_1.6_releasenotes.html>
Improvements to svn:externals
Subversion 1.6 adds a couple of new features for users of svn:externals. The include:

 *   Support for files in svn:externals<http://subversion.tigris.org/svn_1.6_releasenotes.html#file-externals>
 *   Support usual shell quoting rules in externals definitions<http://subversion.tigris.org/svn_1.6_releasenotes.html#shell-quoting-externals>

http://subversion.tigris.org/svn_1.5_releasenotes.html

<http://subversion.tigris.org/svn_1.5_releasenotes.html>
Merge tracking (foundational) (client and server)
Merge tracking means Subversion keeps track of what changes have been merged where. This reduces the overhead involved in maintaining branches, and gives users a way to inquire what changes are merged — or are available to be merged — on different lines of development.
The merge tracking support in Subversion 1.5 is "foundational": its basic functionality is implemented, but there are still parts of our original spec<http://subversion.tigris.org/merge-tracking/> that remain to be done, and merging is sometimes too slow. There will be merge tracking improvements in Subversion 1.5.1 and afterwards. In the meantime:

 *
Take a look at the list of known issues<http://subversion.tigris.org/svn_1.5_releasenotes.html#mt-known-issues>
 *
Read "The Final Word on Merge Tracking"<http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword> in the Subversion Book
 *
Read "Understanding the internals of Subversion's merge tracking feature"<http://www.collab.net/community/subversion/articles/merge-info.html> by Paul Burba

Overview
Subversion's merge tracking is designed to:

 *   Reduce the bookkeeping overhead for branch maintenance
 *   Avoid common cases of the "repeated merge" problem
 *   Allow for cherry-picking of changes

Each changeset is identified by its revision number, and merged changesets are recorded in the new svn:mergeinfo property (known colloquially as "mergeinfo") set on the destination of the merge. Subversion keeps mergeinfo up-to-date automatically, but there is also a way to record/unrecord merges manually<http://subversion.tigris.org/svn_1.5_releasenotes.html#mt-record-only>, since there will always be cases where a human knows something that Subversion doesn't.

Interactive Conflict Resolution (client)
Conflict resolution is now done interactively by the command-line client for the update/switch/merge subcommands, and the client library offers a callback function so other clients can do similarly.

http://subversion.tigris.org/svn_1.4_releasenotes.html

<http://subversion.tigris.org/svn_1.4_releasenotes.html>
svnsync (some features require a 1.4 server)
A new tool — svnsync<http://svn.collab.net/repos/svn/trunk/notes/svnsync.txt> — is now installed as part of the standard distribution. This tool provides the ability to replicate history from one repository to another. The replication can happen all at once, or can be done incrementally through repeated 'sync' operations. Because the tool uses the abstract network (RA) API, the source and destination repositories can be either local, remote, or any combination thereof.
Compatibility note: in order to "push" information into a destination repository, any version of the server will suffice. The pushing is done through ordinary network commits. To "pull" history from the source repository, however, requires a 1.4 (or later) server.
Usage of this tool will be documented in the Subversion book soon, but for now, running svnsync help should suffice; the number of subcommands is very small, and the help system documents them all.

Lance Speelmon
Scholarly Technologist

On Sep 22, 2009, at 1:20 PM, Speelmon, Lance Day wrote:

I need your help in testing the new subversion server: https://takeshi-test.uits.indiana.edu/svn/ over the next two weeks.  Please provide feedback in this thread.

<https://takeshi-test.uits.indiana.edu/svn/>Key points:

1) This is a brand new server (i.e. this is not an in-place upgrade).
2) This is a major svn upgrade (i.e. 1.2.3 --> 1.6.5) with major new functionality.

If testing goes well, an extended outage for the current server will be scheduled to allow full "svnadmin dumps" to be run on the various repositories, copying the dump files, loading dump files, and verifying new repositories.  The results of this process can be seen on the test server (i.e. minus taking the source server offline).  To help with this migration, please try to perform your typical svn operations against the new server - all of your svn usernames and passwords remain the same.  If you run into any trouble, please reply to this thread on list.  Let's give this a couple of weeks of testing and then schedule some down time.  Thanks, L

Lance Speelmon
Scholarly Technologist

On Aug 11, 2009, at 4:16 PM, Speelmon, Lance Day wrote:

We just added more space to svn, so this may change my conversion
plans.  I will report back after talking to Andrew Poland.  Best, L

Lance Speelmon
Scholarly Technologist

On Aug 7, 2009, at 5:11 PM, Michael Wenk wrote:

Lance,

Is there any word on when this update will be done?  The contrib
repository being v1.2.3 is making it difficult to use some
tools(Fisheye/Crucible) and we would like to use these tools.

Thanks,
Mike

Speelmon, Lance Day wrote:
Thomas,

I have been testing an upgrade path to 1.6.x and hope to have that
implemented in the near future.  L

Lance Speelmon
Scholarly Technologist

On Jul 24, 2009, at 1:44 AM, Thomas Amsler wrote:

Are there any plans to upgrade the Sakai Foundation's Subversion?

https://source.sakaiproject.org/svn/
https://source.sakaiproject.org/contrib

They are both at v1.2.3. We are having issues to get our
crucible/fisheye instance to interact properly with this old
version.

Best,
-- Thomas
_______________________________________________
sakai-dev mailing list
sakai-dev at collab.sakaiproject.org<mailto:sakai-dev at collab.sakaiproject.org>
http://collab.sakaiproject.org/mailman/listinfo/sakai-dev

TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org<mailto:sakai-dev-unsubscribe at collab.sakaiproject.org>
with a subject of "unsubscribe"

_______________________________________________
sakai-dev mailing list
sakai-dev at collab.sakaiproject.org<mailto:sakai-dev at collab.sakaiproject.org>
http://collab.sakaiproject.org/mailman/listinfo/sakai-dev

TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org<mailto:sakai-dev-unsubscribe at collab.sakaiproject.org>
with a subject of "unsubscribe"

_______________________________________________
sakai-dev mailing list
sakai-dev at collab.sakaiproject.org<mailto:sakai-dev at collab.sakaiproject.org>
http://collab.sakaiproject.org/mailman/listinfo/sakai-dev

TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"

_______________________________________________
sakai-dev mailing list
sakai-dev at collab.sakaiproject.org<mailto:sakai-dev at collab.sakaiproject.org>
http://collab.sakaiproject.org/mailman/listinfo/sakai-dev

TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://collab.sakaiproject.org/pipermail/sakai-dev/attachments/20090923/c0cf4607/attachment.html 