Ben Collins-Sussman wrote:
> As an outsider, I think nobody will flinch one bit if 'svn log' or
> 'svn blame' aren't merge-sensitive just yet. But not being able to
> handle feature branches? That's the single biggest use-case we have.
> It's what most users currently use 'svn merge' for. It's the
> scenario that the svnbook takes pages to explain, going into horrible
> detail trying to teach users how to manually track revision sumbers to
> get the task done. If "basic merge tracking" can't take away this
> famous pain, what actual benefit is it bringing to users?
>
> I'm going to have a really hard time saying to people, "Oh hey, you
> can now repeatedly merge trunk to your branch now without tracking
> revisions manually. But, um, when you merge back, you better get the
> -rX:Y argument just right." It doesn't feel like very much progress.
> I define "success" as "the user never needs to type a revnum".
+1 on this. We need to at least have this svnmerge.py capability in 1.5. I'd
rather see 1.5 delayed and get this feature in then ship early, i.e. pull a
Blizzard.
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 30 20:16:46 2007