[cc-devel] svn gurus
Victor Stone
fourstones.net at gmail.com
Fri Oct 5 13:13:54 EDT 2007
On 10/1/07, Nathan R. Yergler <nathan at yergler.net> wrote:
> Never mind, I retract my advice after having it's flaws pointed out by
> our esteemed software engineer. Read the book. And then read it
> again. :)
>
turns out the tortoisesvn docs have a reasonable explanation of the
hows and whats
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html
It's a little weird but I get it: at merge time you take a diff of the
branch, from beginning to HEAD (yes, it's a big diff) and apply that
as a patch (!) to the trunk.
Thanks everyone
VS
More information about the cc-devel
mailing list