Conflicts with some of the fixes for 1.1.x

As you can probably see, I felt inspired and merged in a number of fixes.
However, I ran into a couple of issues with a few of the remaining ones.

The first two revisions specified to fix Issue 2124 (r12006 and r12136)
both conflict in branches/1.1.x. Also, the proposed r12327 fix conflicts
when trying to merge it. I think all of them are almost trivial, and I'd
take care of these myself, but I've reached the end of my free time for
today. :-) I just wanted to let people know to expect conflicts in both
merging changes into 1.1.x, and when trying to apply some of the proposed
changes.

-John

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Dec 18 21:29:11 2004