Who here works on Subversion?

[Christopher Schmidt]

On Mon, Oct 03, 2005 at 10:40:25AM -0400, John Abreau wrote:
> If that's the case, then I would think your situation is functionally 
> identical to merging dev into main and then starting a brand new dev fork. 
> In other words, it's just as if you're working with a second development 
> branch after the first merge, but you'd mistakenly reused the name of the 
> first dev branch. 

Except in the situation where main and dev are both altered in a
conflicting way, Subversion doesn't offer any smart techniques for
merging that I'm aware of. In the first case ( from the description ) it
sounded like the Original Poster was not modifying main until after the
merge point.

This seems, to me, to be equivilant to a situation where you have two
branches doing mods to a base set of code -- merging them together
doesn't work simply. I don't think. 

This is why I only use revision control as backup + examining diffs to
give to the boss when they ask "What the heck did you spend 2 hours on?"
:)

-- 
Christopher Schmidt