[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

excess diff between branches

From: Ed L Cashin <ecashin_at_uga.edu>
Date: 2003-07-02 18:14:54 CEST

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
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

... where the diff is really a no-op. I'm working on the linux
kernel, and think the reason is that I did the following:

   * svn copy the tagged original kernel (tags/2.5.72-mm2.orig) to a
     new one, tags/2.5.72-mm2-kexec.orig.

   * apply a third-party patch to a working copy of
     tags/2.5.72-mm2-kexec.orig and commit, so that it's a tagged
     original before applying my changes.

   * svn copy tags/2.5.72-mm2-kexec.orig to branches/macc-kexec

   * switch working copy to branches/macc-kexec.

   * tried to merge in my changes with svn merge, but it didn't work
     (This is a separate issue that had to do with subdirectories
     existing in the working copy and the branches specified for the
     merge but not present in branches/macc-kexec in the repository.)

   * Used svn diff and regular patch to apply my changes, do svn add
     on all new files and subdirectories, and commit.
   * do svn diff between trunk and branches/macc-kexec.

I realize I've made it difficult for svn to know right away that my
changes are the same in both branches, but I still didn't expect to
see the diff so full of false differences.

--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
Received on Wed Jul 2 18:15:48 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.