NYCPHP Meetup

[matt at atopia.net]

That's the thing. Its a perfectly clean working copy.  I even removed it and did a brand new checkout and tried again. There are no local modified files. 

For the record I have used svn for a while in the past and never encountered this recent issues. 
------Original Message------
From: Dan Cech
Sender: talk-bounces at lists.nyphp.org
To: NYPHP Talk
Cc: N.J. Thomas
ReplyTo: NYPHP Talk
Subject: Re: [nycphp-talk] [nycbug-talk] OT: SVN problem
Sent: Oct 8, 2009 12:49

Matt Juszczak wrote:
> OK, I'm not really understanding what's going on here anymore.
> 
> Here's something I did:
> 
> oak$ svn merge -r 22:23 trunk/ branches/stable/
> --- Merging r23 into 'branches/stable':
>    C branches/stable/application/controllers/a/privs.php
> Summary of conflicts:
>   Tree conflicts: 1
> oak$ svn stat
>       C branches/stable/application/controllers/a/privs.php
>       >   local edit, incoming delete upon merge
> oak$
> 
> 
> 
> I don't understand.  All I did in revision 22:23 was delete the
> privs.php file.  Why is it saying it's a conflict?  It should just be
> deleting it also when I merge.
> 
> Or does it think the delete is a conflict even though it's supposed to
> do that.

It sounds like your local copy of privs.php was modified before the
merge, so svn couldn't resolve the conflict that implies (trying to both
modify and delete the same file).  A good rule of thumb is to only merge
into a clean working copy, not only does it cut down on issues like
these, you also don't end up with a revision that has some changes from
the merge and other changes from your modifications mixed together.

I heartily recommend the excellent book 'Version Control with
Subversion', available free online here:

http://svnbook.red-bean.com/

Dan
_______________________________________________
New York PHP Users Group Community Talk Mailing List
http://lists.nyphp.org/mailman/listinfo/talk

http://www.nyphp.org/Show-Participation