Re: svn diff between working copy is different from svn diff between repository path

[Ben Collins-Sussman <su...@collab.net>]

On Thu, 2004-06-24 at 04:16, Hardi Gunawan wrote:
> All this while I'm doing svn diff between working
> copies.  Then I'd merge a branch into the trunk. 
> After sometimes, I realized that the 2 working copies
> is not identical, even after a merge.
> 
> So I did a diff between the 2 working copies.  It
> shows no result.  Then I tried to do ad diff between
> the 2 repository location.  It shows a lot of result.
> 
> Before every diff or merge, I always run a svn status
> and svn update on both working copy.
> 
> Did I do something wrong?  Seems like my repository
> has gone haywire now  :(

You need to show us specific examples, not give us descriptions of what
you think you're doing.  If we can see your exact commands and results,
we can de-confuse you and show you what's really happening.

I hope you understand that 'svn diff foo.c bar.c' does *not* compare
foo.c and bar.c with each other!  It means, "show me any local changes
on foo.c, then show me any local changes on bar.c".  That might be
leading to your confusion.  

There's no way (at this time) to have 'svn diff' compare two working
copies.  That's probably the source of confusion.



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

Re: svn diff between working copy is different from svn diff between repository path

[Hardi Gunawan <ha...@yahoo.com>]

--- Ben Collins-Sussman <su...@collab.net> wrote:
> On Thu, 2004-06-24 at 04:16, Hardi Gunawan wrote:
> > All this while I'm doing svn diff between working
> > copies.  Then I'd merge a branch into the trunk. 
> > After sometimes, I realized that the 2 working
> copies
> > is not identical, even after a merge.
> > 
> > So I did a diff between the 2 working copies.  It
> > shows no result.  Then I tried to do ad diff
> between
> > the 2 repository location.  It shows a lot of
> result.
> > 
> > Before every diff or merge, I always run a svn
> status
> > and svn update on both working copy.
> > 
> > Did I do something wrong?  Seems like my
> repository
> > has gone haywire now  :(
> 
> You need to show us specific examples, not give us
> descriptions of what
> you think you're doing.  If we can see your exact
> commands and results,
> we can de-confuse you and show you what's really
> happening.
> 
> I hope you understand that 'svn diff foo.c bar.c'
> does *not* compare
> foo.c and bar.c with each other!  It means, "show me
> any local changes
> on foo.c, then show me any local changes on bar.c". 
> That might be
> leading to your confusion.  
> 
> There's no way (at this time) to have 'svn diff'
> compare two working
> copies.  That's probably the source of confusion.

That's it.  Thank you so much.  All the while I
thought that svn diff compare two working copies...

Thank you again


		
__________________________________
Do you Yahoo!?
Yahoo! Mail is new and improved - Check it out!
http://promotions.yahoo.com/new_mail

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