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

RE: SVN reporting a new file has been deleted and added in the same revision

From: Giulio T <giulio.troccoli_at_uk.linedata.com>
Date: Wed, 8 Apr 2009 13:14:45 +0100

> Greetings, Giulio T!
>
> > I'm using SVN 1.4.4 on a RHEL4 with Apache 2.0
>
> > In the post-commit hook I use svnlook the get a list of
> files that have been added and/or deleted to send an email about them.
>
> > A developer committed some files in revision 4540 and
>
> ln1sub01 svn>> svnlook changed -r4540 /data/Repositories/svn-icon
> > A wip/src/co/pr/
> > A wip/src/co/pr/copr.c
>
> > This is correct. Today we merged those changes using the following
> > commands
>
> ln1sub01 svn>> cd /data/WorkingCopies/svn-icon/5.31/test
> ln1sub01 svn>> svn merge --change 4540
> http://localhost/svn-icon/wip/src src
>
> > and commit in revision 4617. But then
>
> ln1sub01 svn>> svnlook changed -r4617 /data/Repositories/svn-icon
> > A 5.31/test/src/co/pr/
> > D 5.31/test/src/co/pr/copr.c
> > A 5.31/test/src/co/pr/copr.c
>
> > Can someone explain why the deletion?
>
> Probably, there was been a copr.c already, and it has been
> replaced by the newly added copr.c from that developer.
>
> Take a look at a whole log for that file from different
> points in repository to discover the true origin of both files.
>

In revision 4616 (the one before the merge) directory co/pr did not exist, let alone copr.c

Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1595621

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-08 14:15:43 CEST

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