|
I am making this megathread because I often have questions with no answers rather than me having all the answers myself, but here are some resources. SVN Red-Bean book - complete book on all of SVN functionality. A must read for anyone that uses SVN on a regular basis. It has helped me immensely once I got the idea of merging. A tour of Git - basically a rundown of the useful commands. Mercurial: The Definitive Guide - Recommended by Bonus If anyone has any other link suggestions, let me know. On to my question... I have one trunk directory and used svn copy to make a branch. I've changed some things in the trunk including deleting some files. I've used svn log to figure out when the branch was made and what revisions I need to merge and proceeded to try to merge the changes from trunk into the branch. Everything merges correctly except the deletes. The svn merge command just says "skipped" next to all of the files that should have been deleted but all of the other changes are merged perfectly. I thought that skipped usually meant that a change was made to a file that doesn't exist in the working copy, but the file is definitely there (in repository as well as working copy) so I don't know what's wrong. MonkeyMaker posted:Didn't see this posted on the last page or so. Pro Git, new book, available for free online: http://progit.org/book/ sonic bed head fucked around with this message at 04:08 on Aug 4, 2009 |
#
¿
Apr 8, 2009 16:16
|
|
|
|
| # ¿ Apr 28, 2024 00:27 |
|
|
mwarkentin posted:OP, did you use the "svn delete" command to delete the files, or did you remove them manually? I used "svn delete." The files are definitely not in the head revision of the trunk. Also, the merge command is exactly skipping the ones that have been deleted, so it must know that the deletions have happened.
|
|
#
¿
Apr 8, 2009 20:03
|
|
|
Is it possible to run an svn log that takes into account the current revision and goes some amount of revisions back? Basically I'm looking for something equivalent to this without searching back for a revision number.code:
|
|
#
¿
Apr 24, 2009 19:49
|
|
|
ignorant slut posted:subversion question: code:
|
|
#
¿
Apr 24, 2009 19:55
|
|
|
OddObserver posted:Well... svn log --limit 5 would print the last 5 changelog entries, which may be more than 5 rnumbers back, is that OK? If it's not, dunno of a builtin option, but you could probably grep it out of 'svn info' output easily, so a quick script in your scripting language of choice may be less work than reading the manual.  That's exactly what I'm looking for. I didn't know that there was a limit option.
|
|
#
¿
Apr 27, 2009 14:20
|
|
|
I had a trunk directory out of which I made a branch a few months ago. All development was in the branch and we had < 10 small bug fixes in the trunk. I merged the trunk into the branch so now all of the bug fixes are in the branch and the branch is now the perfect production ready bit of code. How can I now just move this directly to the trunk directory and keep the correct revision history? I tried merging the branch back into the trunk and it skipped a million things and had conflicts, which shouldn't happen because nothing has changed in those files. Some files even had the status "R" which I can't find documented anywhere. Thanks in advance.
|
|
#
¿
May 5, 2009 15:33
|
|
|
epswing posted:"Ignore strange behavior" is not a real solution. Something is definitely wrong here, either in my understanding or in svn itself. I am pretty sure that your understanding of what svn:ignore does is incorrect. svn:ignore has nothing to do with the repository/server. It is just a setting that tells the client to ignore that directory when updating/committing. It doesn't mean that you can't force an update by calling it directly on that directory, it just means that if a higher directory is updated, svn will ignore updating that directory from the repository.
|
|
#
¿
May 28, 2009 15:02
|
|
|
If I have a working copy checked out with local changes, is it possible for me to copy that working copy to make a pristine, non changed copy locally? I am trying to have two different copies of the same branch, but I don't want to go through checking it out again because it's huge and will take 45 minutes on my slow internet connection. I also don't want to revert my current working copy. Thanks.
|
|
#
¿
Jun 4, 2009 20:23
|
|
|
Is there any way to prevent certain directories from being checked out by users in SVN? I can't find a hook that corresponds and I'm not using DAV but rather just svn+ssh.
|
|
#
¿
Sep 1, 2009 20:12
|
|
|
Doc Block posted:It's in the configuration/authorization stuff for the repository. check /path/to/your/repos/conf (or /repos/config, I can't remember). Which authorization schemes work? Can I still use svn+ssh? I would like to just keep using shell accounts rather than set something else up.
|
|
#
¿
Sep 2, 2009 12:09
|
|
|
How big is what you are trying to check out? Are you talking gigabytes? I've checked out up to about 4GB before and it's never been too much of a problem. Have you tried using the command line instead of tortoise and seeing what happens?
|
|
#
¿
Sep 16, 2010 19:55
|
|
|
BizarroAzrael posted:I actually did a Robocopy from another copy on another machine, which seemed to go fine. Will this be alright for things like commits, or will it identify me as the person I copied it from? Might this be a better solution than a normal checkout? As long as you also copied the .svn directories, it is exactly the same as a checkout. SVN isn't really built for tons of binary files like that. This might help. http://stackoverflow.com/questions/538643/how-good-is-subversion-at-storing-lots-of-binary-files
|
|
#
¿
Sep 19, 2010 16:41
|
|
|
Does anyone know of any resources that I can read that can help me in an effort to have a CVS and mercurial version of a codebase that can be easily kept in sync? The higherups don't yet want a clean switch to mercurial and they want to be able to use both for a certain amount of time.
|
|
#
¿
Oct 20, 2010 14:52
|
|
|
|
| # ¿ Apr 28, 2024 00:27 |
|
|
b0lt posted:I want to track my programming assignments for a class with git. Are there any free git hosting providers that offer private repositories? Would putting each assignment in its own folder in a repo be the best way to organize things? I've got an extremely limited amount of disk quota on the university AFS share (5 MB? really?), so being able to track everything remotely but only keep the most recent assignment on disk locally would be nice. if it's just for class, why do you care that it's public? You should consider it a good opportunity to get your code out there for future employers.
|
|
#
¿
Feb 1, 2011 03:15
|
|