[CCC DEV] Status E Changes

[Adam Sampson]

Matt Jadud <jadudm at gmail.com> writes:

> To anyone else: please update that page if you don't like the merge
> instructions, or think it should be done differently. That worked, but
> I don't know if there are preferred tools, etc.

I've simplified this quite a bit -- with the merge tracking support in
Subversion 1.5, you don't need to do the dance to figure out where to
merge from any more (that is, it effectively has the "svnmerge" tool
that we used to use built in).

Dennis: it's best to do a merge properly rather than copying changes
around by hand; if you do it by hand, the history won't be recorded
properly in the repository, and you're more likely to lose work
accidentally. If you're not comfortable with how branching and merging
work in Subversion, I'd strongly recommend the Subversion book:
  http://svnbook.red-bean.com/en/1.5/index.html

-- 
Adam Sampson <ats at offog.org>                         <http://offog.org/>