You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Chia Shee Liang <sh...@lit.org.sg> on 2002/04/15 02:28:22 UTC

Diffs between branches?

Is it possible to get diffs between different directories in the repository?
Suppose I have svn/branchA and svn/branchB, how do I get a diff file between
them?

Please CC: as I'm not on the list(yet).

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

Re: Diffs between branches?

Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Ben Collins-Sussman <su...@collab.net> writes:
> 'svn diff' and 'svn merge' share a *lot* of code.  It would only take
> me 1/2 hour to make 'svn diff' operate on two urls.  I already had to
> do essentially the same thing for 'svn merge' -- it's almost always
> comparing two different urls.
> 
> Will do this morning.

Oh, rock. :-)

If it's really a 1/2 hour job, I'm very impressed.  It looked like
more than that to me, but I'd love to be wrong!


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

Re: Diffs between branches?

Posted by Ben Collins-Sussman <su...@collab.net>.
Karl Fogel <kf...@newton.ch.collab.net> writes:

> Karl Fogel <kf...@newton.ch.collab.net> writes:
> > We should at least return SVN_ERR_UNIMPLEMENTED or something, if we
> > don't handle URLs (or better yet, just handle them)... I'll look into
> > this.
> 
> Hmmm, okay, wish I could have fixed it tonight, but it's a bit bigger
> than that.  See new bite-sized bug
> 
>     http://subversion.tigris.org/issues/show_bug.cgi?id=674

'svn diff' and 'svn merge' share a *lot* of code.  It would only take
me 1/2 hour to make 'svn diff' operate on two urls.  I already had to
do essentially the same thing for 'svn merge' -- it's almost always
comparing two different urls.

Will do this morning.

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

Re: Diffs between branches?

Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Karl Fogel <kf...@newton.ch.collab.net> writes:
> We should at least return SVN_ERR_UNIMPLEMENTED or something, if we
> don't handle URLs (or better yet, just handle them)... I'll look into
> this.

Hmmm, okay, wish I could have fixed it tonight, but it's a bit bigger
than that.  See new bite-sized bug

    http://subversion.tigris.org/issues/show_bug.cgi?id=674

-Karl

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

Re: Diffs between branches?

Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Chia Shee Liang <sh...@lit.org.sg> writes:
> Is it possible to get diffs between different directories in the repository?
> Suppose I have svn/branchA and svn/branchB, how do I get a diff file between
> them?
> 
> Please CC: as I'm not on the list(yet).

Huh.  I thought it was, but apparently not:

   $ svn diff http://svn.collab.net/repos/svn/branches/0.11.0 \
              http://svn.collab.net/repos/svn/trunk

   subversion/libsvn_wc/questions.c:60
   apr_error: #2, src_err 0 : (No such file or directory)
     svn_wc_check_wc: http://svn.collab.net/repos/svn/branches does not exist
   $ 

We should at least return SVN_ERR_UNIMPLEMENTED or something, if we
don't handle URLs (or better yet, just handle them)... I'll look into
this.

-Karl

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