Ed L Cashin <ecashin@uga.edu> writes:
> Hi. First let me say that I really like svn.
>
> I am getting excess diff output in a diff between branches. Things
> like this:
>
> Index: .gdbinit-nilda
> ===================================================================
> --- .gdbinit-nilda (.../trunk) (revision 65)
> +++ .gdbinit-nilda (.../branches/2.5.72-mm2-kexec) (revision 65)
> @@ -1,5 +0,0 @@
> -define rmt
> -shell echo -e "\003" >/dev/ttyS0
> -set remotebaud 9600
> -target remote /dev/ttyS0
> -end
> Index: .gdbinit-nilda
> ===================================================================
> --- .gdbinit-nilda (.../trunk) (revision 65)
> +++ .gdbinit-nilda (.../branches/2.5.72-mm2-kexec) (revision 65)
> @@ -0,0 +1,5 @@
> +define rmt
> +shell echo -e "\003" >/dev/ttyS0
> +set remotebaud 9600
> +target remote /dev/ttyS0
> +end
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." 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.
* use the --ignore-ancestry switch with 'svn diff'. this tells the
server to give you just a "dumb" diff based on paths alone.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 2 19:01:56 2003