[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: Eric Gillespie <epg_at_pretzelnet.org>
Date: 2002-04-29 01:48:56 CEST

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:

0 gnuserv% svn log gnuserv.c
------------------------------------------------------------------------
rev 48: epg | Thu 18 Apr 2002 01:51:03 | 3 lines

Fix off-by-one error in name of directory for local domain socket
(and add svn keywords).

------------------------------------------------------------------------
rev 47: epg | Thu 18 Apr 2002 01:49:13 | 2 lines

Copy gnuserv to the trunk.

------------------------------------------------------------------------

It doesn't have the log message from the import :(.

--
Eric Gillespie <*> epg@pretzelnet.org

Conformity is a sin.

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

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