Re: excess diff between branches

Ben Collins-Sussman <sussman@collab.net> writes:

...
> That's because the two files are "unrelated" in the repository; 'svn
> diff' is showing you a {delete, add}. You asked the question, "how do
> I convert this one tree to the other tree?", and the repository is
> saying, "first delete this file, then add this new file with the same
> name."

Oh, thanks. I didn't think I was asking that, but it makes sense if I
think of it as a diff between branches and not between the files in
the branches.

> When you committed the second branch, it contained a bunch
> "adds" of new nodes, rather than changes to file-copies.
>
> You have two options here:
>
> * follow the proper "vendor branching" procedure described in
> chapter 6 of the book. Use the svn_load_dirs.pl script to help.

I'll re-read it. I'm versioning only a subset of the files in the
linux kernel, so I get really fast svn performance compared to before,
but it's easier for me to get confused.

> * use the --ignore-ancestry switch with 'svn diff'. this tells the
> server to give you just a "dumb" diff based on paths alone.

Ah, thanks. That will help until I get the hang of doing it the
proper way.

-- 
--Ed L Cashin            |   PGP public key:
  ecashin_at_uga.edu        |   http://noserose.net/e/pgp/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org