-----Original Message-----
From: Bill Hart
Sent: Thursday, July 26, 2012 10:34 PM
To: mpir-devel@googlegroups.com
Subject: Re: [mpir-devel] Re: MPIR 2.6 release progress
svn doesn't do merges by diffing the branches. It has to replay the
commits from trunk over the top of mpir-exp in the correct order,
starting with the state of mpir-exp at the point the branch was made.
At least that is how I think it does it.
So some of those C's are "create", others "conflict", depending on
which column they are in, I think. The number of actual conflicts is
listed at the bottom.
My schedule got rearranged about 10 mins ago, and I will now be
attempting the update of mpir-exp tomorrow night instead of Saturday.
I will be unavailable Saturday.
====================================
I think it will be far easier to move the changes in the mpir-exp branch
into trunk manually.
I can do this tomorrow if you have time to assist with it in case I run into
any issues.
Brian
--
You received this message because you are subscribed to the Google Groups
"mpir-devel" group.
To post to this group, send email to mpir-devel@googlegroups.com.
To unsubscribe from this group, send email to
mpir-devel+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/mpir-devel?hl=en.
