[jboss-dev] subversion 1.5 diffs

[Max Rydahl Andersen]

Yes, they adopted most of what svnmerge.py does.

See http://subversion.tigris.org/merge-tracking/ for what they did and did  
not make available in svn 1.5

I for one would welcome if moved up to svn 1.5 for this feature alone :)
/max

> So I'm reading through the current svn manual merging section, and it  
> says:
>
> "In the examples that follow, we're assuming that both your Subversion  
> client and server are
> running Subversion 1.5 (or later). If either client or server is older  
> than version 1.5, things
> are more complicated: the system won't track changes automatically, and  
> you'll have to
> use painful manual methods to achieve similar results. That is, you'll  
> always need to use
> the detailed merge syntax to specify specific ranges of revisions to  
> replicate (see the sec-
> tion called “Merge Syntax: Full Disclosure” later in this chapter), and  
> take special care to
> keep track of what's already been merged and what hasn't. For this  
> reason, we strongly re-
> commend that you make sure your client and server are at least at  
> version 1.5. "
>
> Of course we are running 1.4.2. It looks like the big change was  
> tracking merge information via an svn:mergeinfo property?
>
> _______________________________________________
> jboss-development mailing list
> jboss-development at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/jboss-development



-- 
/max