Skip to Content.
Sympa Menu

cc-devel - Re: [cc-devel] svn gurus

cc-devel AT lists.ibiblio.org

Subject: Developer discussion for Creative Commons technology and tools

List archive

Chronological Thread  
  • From: "Victor Stone" <fourstones.net AT gmail.com>
  • To: "Nathan R. Yergler" <nathan AT yergler.net>
  • Cc: creative commons developers <cc-devel AT lists.ibiblio.org>
  • Subject: Re: [cc-devel] svn gurus
  • Date: Fri, 5 Oct 2007 10:13:54 -0700

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




Archive powered by MHonArc 2.6.24.

Top of Page