Etria Lists

Tim Hicks wrote:
> Hi,
> 
> I've spent the day working on Quills.
> 
> To cut a long story short, my various tim2p-towards-1.7 branches now 
> contain all changes that have been applied to their respective trunks 
> since the branches were cut.  Tests pass (except for one failing one for 
> Products.Quills), and I would therefore like to merge all of the 
> branches back to their respective trunks.
> 
> The problem is, I appear to be a bit of a wally when it comes to using 
> svn.  When I try to merge my tim2p-towards-1.7 branches to my trunk 
> working copies, all of a sudden tests start to fail.  This is rather 
> frustrating.
> 
> Can somebody help me with this?

Tom von S has sorted me out here.  Merges now being checked in.

Tim