Re: best merge method

Jon Scott Stevens wrote:

> In other words, merge all the changes from the trunk that are 'new' onto
> the branch. I can see where 'new' is relative, but shouldn't svn be able
> to figure this out?

In a perfect world, absolutely.

>
> It is a pain to have to manually remember the last time I did a merge. I
> have been putting it into the commit messages, but things still get
> confusing for me quickly. Is there a better method to remember this stuff?

Yes, wait for us to implement automatic repeated merge tracking. This
is the "really huge" feature (beyond file-locking) that we need to
compete with major commercial version control systems.

It's not that you're not getting it, it's that you're finally
experiencing the itch all CVS and SVN users have. It's definitely a
pain to have to keep track of merges yourself, and specify them so
carefully. That said, SVN makes things a tad easier by allowing you to
merge whole changesets at a time, rather than individual files (like CVS).

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 10 20:30:17 2004