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

Re: 4 bugs in svn diff (IssueZilla gives me Internal Server Error)

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-04-29 02:07:20 CEST

Eric Gillespie <epg@pretzelnet.org> writes:

> Philip Martin <philip@codematters.co.uk> writes:
>
> > Just checking some basic stuff: the symptoms you describe will occur
> > if branch1 and branch2 don't have a common ancestor. It is not enough
> > that the directory trees have files with the same names, they have to
> > have been created via 'svn cp'. Without a common ancestor you get
> > something like
>
> I think i did it right. I used svn import to import the gnuserv
> source into the 3rdparty directory, and then used svn cp to copy
> it to the trunk, where i made my modifications. However, svn log
> makes me worry something is wrong:

Did you copy the whole directory or individual files?

If I copy a file from one directory to another, and then diff the two
files I see a diff that removes one file and adds the other.

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 29 02:08:25 2002

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