Who here works on Subversion?

[Kevin D. Clark]

"Steven W. Orr" <steveo at syslang.net> writes:

> Now that we want to do another merge from dev back to main, the merge
> tool provides no help in knowing that a previous merge has already
> happened. The result is that every affected file will have to be
> merged manually.

This is the very first thing I wondered about after I read a
Subversion manual.  I wondered if any of the GUI tools helped rectify
this situation.  I haven't had the time to investigate this, since for
my personal uses I don't need branches in my Subversion tree (yet).

  http://svnbook.red-bean.com/en/1.1/ch04s03.html#svn-ch-4-sect-3.3

Either Subversion itself needs to provide this feature, a GUI needs to
smooth this behavior over, or else you're out of luck and need to
track your merges unto one of the previous two <things> happens.

--kevin
-- 
GnuPG ID: B280F24E                     And the madness of the crowd
alumni.unh.edu!kdc                     Is an epileptic fit
                                       -- Tom Waits