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

Diff problem

From: Peter Ledbrook <peter.ledbrook_at_august.uk.com>
Date: 2003-11-12 17:48:05 CET


First a bit of background. I have a main trunk of development at the URL
http://aug00277/svn/auganiser/trunk and a particular branch at
http://aug00277/svn/auganiser/branches/data-serialisation. I switched my
working copy to the branch and merged all the most recent changes from the
trunk into it. This was to make it easier to merge the major changes from
the branch back into the trunk.

Anyway, I'm now trying to get the differences between the trunk at HEAD and
my working copy (still switched to the branch). This is the command I'm

  svn diff --old http://aug00277/svn/auganiser/trunk --new .

The problem is, the diff does not seem to be comparing the working copy with
the trunk. Instead it seems to be comparing it with the branch. Here's a
quick extract of the diff:

--- auganiser-data/src/com/uk/august/auganiser/data/command/QueryData.java
(revision 245)
+++ auganiser-data/src/com/uk/august/auganiser/data/command/QueryData.java
(working copy)
@@ -201,7 +201,8 @@
      * Returns the maximum number of results that will be returned
- * by this query.
+ * by this query. This method will return '0' if there is no
+ * limit on the row count.
     public int getMaxResults() {
         return mMaxResults;
@@ -209,7 +210,7 @@
      * Sets the limit on the number of results that this query will
- * return.
+ * return. Supply a value of 0 if you want to remove the limit.
     public void setMaxResults(int pMaxResults) {
         mMaxResults = pMaxResults;

Would it help to say that there is no difference between this file on the
trunk and in my working copy? This was a change made on the trunk and then
merged into my working copy on the branch.

Am I getting something horribly wrong here?



To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 12 17:58:03 2003

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

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