diff on working copies

[Martin Struwe <ma...@von-oertzen.org>]

who can give me access to the issue-tracker?

* Your account does not have the "Project Issue Tracking - Query"
   permission needed for you to access the page you requested in
   the subversion project (view your permissions). Either ask the
   project administrator for more permission, or log in using a
   different account.
* You are currently logged in as mastr.

maybe my problem belongs to issue 1082.
i can't diff two working copies.
i wanted to merge in all changes from trunk to my
branch.
than i wanted to merge in all changes from my branch
to the trunk.
all went well, but before i commit, i wanted to diff
the working copies.

later i noticed, even if i check out branch and trunk,
i get no diff.
but system/shell diff gave a lot

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: diff on working copies

[kf...@collab.net]

Martin Struwe <ma...@von-oertzen.org> writes:
> who can give me access to the issue-tracker?

Did you have the 'Observer' role in project Subversion at
subversion.tigris.org?  It appears not...

I've now given 'mastr' observer status.  Try again,

Best,
-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: diff on working copies

[Martin Struwe <ma...@von-oertzen.org>]

i worte:
> i can't diff two working copies.
> i wanted to merge in all changes from trunk to my
> branch.
> than i wanted to merge in all changes from my branch
> to the trunk.
> all went well, but before i commit, i wanted to diff
> the working copies.
> 
> later i noticed, even if i check out branch and trunk,
> i get no diff.
> but system/shell diff gave a lot

svn diff trunk branches/my_branch
do a diff of both working copies to the repository.

maybe i should use this:
svn diff --old=trunk --new=branches/my_branch

but the result is:
   svn: Sorry, svn_client_diff was called in a way that
        is not yet supported
   svn: Only diffs between a path's text-base and its
        working files are supported at this time

svn, version 1.1.1 (r11581)
compiled Nov 11 2004, 04:27:01

so i think, the "svn help diff" show a future-feature,
because "OLD-TGT and NEW-TGT may be working copy paths"
is not true at the moment, rigt?

   usage: 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] \
             [--new=NEW-TGT[@NEWREV]] [PATH...]
   2. Display the differences between OLD-TGT as it was seen in OLDREV and
      NEW-TGT as it was seen in NEWREV.  PATHs, if given, are relative to
      OLD-TGT and NEW-TGT and restrict the output to differences for those
      paths.  OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].
      NEW-TGT defaults to OLD-TGT if not specified.  -r N makes OLDREV default
      to N, -r N:M makes OLDREV default to N and NEWREV default to M.

i have to commit one working copy, before i can use
my working copy as NEW-TGT (but not as OLD-TGT).

svn diff --old=$r/trunk --new=branches/my_branch/
Index: branches/my_branch/file.txt
===================================================================
--- branches/my_branch/file.txt (.../file:///repos2/trunk) (revision 2)
+++ branches/my_branch/file.txt (.../branches/my_branch)   (working copy)
@@ -1 +1,2 @@
  line one
+line two

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org