merge tracking in Subversion 1.5

Here’s a heads-up for everyone about a new feature in Subversion 1.5:

I upgraded my laptop to Fedora 10 over the weekend, which means that I’m now
using Subversion 1.5 locally. The SVN 1.5 client has merge tracking. This
means that when I want to merge changes from the trunk back to my working
branch, I don’t have to look up what the version number of the last merge I
did was—the client keeps track of that for me now. This eliminates a step
which I always found irritating and error-prone, and I applaud the Subversion
developers for adding this.

Thus spake “uckelman”:

Or, rather: This would work, if SF were using Subversion 1.5 on its end.
Doh!


J.


Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org

Post generated using Mail2Forum (mail2forum.com)

I was perusing the 1.5 manual on the web and it looks quite nice.

Shame about the SF compatibility.

  • M.

Post generated using Mail2Forum (mail2forum.com)

Thus spake “Michael Kiefte”:

Actually, SF upgraded to Subversion 1.5 on 14 October, according to this:

sourceforge.net/community/forum … =3767&page

In order to take advantage of the 1.5 features, we have to upgrade our
repository to the 1.5 format (see under “Repository Upgrades”):

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

I’m going to do that tomorrow, so we can take advantage of the new features.


J.


Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org

Post generated using Mail2Forum (mail2forum.com)

Aha! That explains some strange things that have started happening when I try and merge stuff. My current version of Subversive is not coping.


Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org

Post generated using Mail2Forum (mail2forum.com)

Thus spake “Brent Easton”:

A compliant 1.4 client should still work with a 1.5 repository. Maybe
their implementation is not so good?


J.


Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org

Post generated using Mail2Forum (mail2forum.com)

Thus spake Joel Uckelman:

It appears that the new merge functionality works now, without any
intervention on my part.


J.


Messages mailing list
Messages@forums.vassalengine.org
forums.vassalengine.org/mailman/ … engine.org

Post generated using Mail2Forum (mail2forum.com)