Re: repeated merge fear

Ben Collins-Sussman writes:
>
> I know that Clearcase *requires* that you create a personal branch
> before creating every single change,

<schoolyard>
Oh no it doesn't.
</schoolyard>

You have to check out an element in ClearCase before you can modify
it, but if you want you can do that directly from /main (and reserved
as well, which is just cause for execution in some shops I've worked
in. Of course, enlightened ClearCase administrators disable this, and
force the auto-creation of a branch ;-)

> The repeated merge problem isn't a showstopper by any means: it's
> just that it would be *nicer* if 'svn merge' automatically remembered
> this stuff for you.

This is where ClearCase is both wonderful and a pain in the posterior:
if you set it up right, you don't have to keep track of merge points,
if you set it up wrong, things change out from under you in your view,
and you end up checking out (and building) from a non-deterministic
mix of sources. Then again, it's ClearCase, so you never lose history.

-- 
Mobile: +33 6 19 49 54 48
Tel: +33 4 92 94 05 94
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org