Re: [nycbug-talk] OT: SVN problem

View: New views

6 Messages — Rating Filter: Alert me

	Re: [nycbug-talk] OT: SVN problem by Matt Juszczak :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message > sounds like you're checking in a file with local modifications, what > does svn stat on that file say?.. I'm not though! I've done this numerous times before with no issues. Here's a full snap: oak$ ls branches tags trunk oak$ ls branches oak$ svn stat oak$ du -sh trunk 1.6M trunk oak$ svn copy trunk branches/tags A branches/testing oak$ svn stat A + branches/testing M + branches/testing/htdocs/static/js/global.js oak$ ? _______________________________________________ New York PHP Users Group Community Talk Mailing List http://lists.nyphp.org/mailman/listinfo/talk http://www.nyphp.org/Show-Participation
	Re: [nycbug-talk] OT: SVN problem by Matt Juszczak :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message > Did you do an "svn up" before doing all this? Tried svn up, did a brand new checkout, etc. etc. > What is the output of "svn ls -R trunk"? Hopefully this is enough info: oak$ svn ls -R trunk \| wc 115 115 3790 oak$ svn ls -R trunk \| grep global.js htdocs/static/js/global.js > What is the output of "svn st -u trunk"? oak$ svn st -u trunk Status against revision: 123 oak$ _______________________________________________ New York PHP Users Group Community Talk Mailing List http://lists.nyphp.org/mailman/listinfo/talk http://www.nyphp.org/Show-Participation
	Re: [nycbug-talk] OT: SVN problem by Matt Juszczak :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message > Apart from printing out "sending ...global.js" which I admit is weird, > does the cp and commit do the right thing? i.e. are the branches created > and all the files you expect there? Yes. I ended up fixing this by re-creating the repository. And it's no longer occuring. My guess is something in one of the .svn directories got messed up. _______________________________________________ New York PHP Users Group Community Talk Mailing List http://lists.nyphp.org/mailman/listinfo/talk http://www.nyphp.org/Show-Participation
	Re: [nycbug-talk] OT: SVN problem by Matt Juszczak :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message 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. _______________________________________________ New York PHP Users Group Community Talk Mailing List http://lists.nyphp.org/mailman/listinfo/talk http://www.nyphp.org/Show-Participation
	Re: [nycbug-talk] OT: SVN problem by Dan Cech :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message 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
	Re: [nycbug-talk] OT: SVN problem by Matt Juszczak :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message 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@... To: NYPHP Talk Cc: N.J. Thomas ReplyTo: NYPHP Talk Subject: Re: [nyphp-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 _______________________________________________ New York PHP Users Group Community Talk Mailing List http://lists.nyphp.org/mailman/listinfo/talk http://www.nyphp.org/Show-Participation

	Re: [nycbug-talk] OT: SVN problem by Matt Juszczak :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message > sounds like you're checking in a file with local modifications, what > does svn stat on that file say?.. I'm not though! I've done this numerous times before with no issues. Here's a full snap: oak$ ls branches tags trunk oak$ ls branches oak$ svn stat oak$ du -sh trunk 1.6M trunk oak$ svn copy trunk branches/tags A branches/testing oak$ svn stat A + branches/testing M + branches/testing/htdocs/static/js/global.js oak$ ? _______________________________________________ New York PHP Users Group Community Talk Mailing List http://lists.nyphp.org/mailman/listinfo/talk http://www.nyphp.org/Show-Participation
	Re: [nycbug-talk] OT: SVN problem by Matt Juszczak :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message > Did you do an "svn up" before doing all this? Tried svn up, did a brand new checkout, etc. etc. > What is the output of "svn ls -R trunk"? Hopefully this is enough info: oak$ svn ls -R trunk \| wc 115 115 3790 oak$ svn ls -R trunk \| grep global.js htdocs/static/js/global.js > What is the output of "svn st -u trunk"? oak$ svn st -u trunk Status against revision: 123 oak$ _______________________________________________ New York PHP Users Group Community Talk Mailing List http://lists.nyphp.org/mailman/listinfo/talk http://www.nyphp.org/Show-Participation
	Re: [nycbug-talk] OT: SVN problem by Matt Juszczak :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message > Apart from printing out "sending ...global.js" which I admit is weird, > does the cp and commit do the right thing? i.e. are the branches created > and all the files you expect there? Yes. I ended up fixing this by re-creating the repository. And it's no longer occuring. My guess is something in one of the .svn directories got messed up. _______________________________________________ New York PHP Users Group Community Talk Mailing List http://lists.nyphp.org/mailman/listinfo/talk http://www.nyphp.org/Show-Participation
	Re: [nycbug-talk] OT: SVN problem by Matt Juszczak :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message 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. _______________________________________________ New York PHP Users Group Community Talk Mailing List http://lists.nyphp.org/mailman/listinfo/talk http://www.nyphp.org/Show-Participation
	Re: [nycbug-talk] OT: SVN problem by Dan Cech :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message 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
	Re: [nycbug-talk] OT: SVN problem by Matt Juszczak :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message 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@... To: NYPHP Talk Cc: N.J. Thomas ReplyTo: NYPHP Talk Subject: Re: [nyphp-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 _______________________________________________ New York PHP Users Group Community Talk Mailing List http://lists.nyphp.org/mailman/listinfo/talk http://www.nyphp.org/Show-Participation