[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Merging r19041, r19060 to 1.3.x

From: Peter N. Lundblad <peter_at_famlundblad.se>
Date: 2006-04-03 20:23:15 CEST

Hi,

While trying to merge r19041 onto the 1.3.x branch, I discovered that
it doesn't merge cleanly. It skips most of the files and gives
conflicts in one file. Could someone either do the merge, or create a
backport branch for this?

Thanks,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 3 20:23:44 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.