Git will not prevent conflict in merges but can reconcile history even when they do not share any parent ancestor. (through The grafts file (.git/info/grafts), which is a list, one per line, of a commit followed by its parents, that you can modify for that “reconciliation” purpose.) So pretty powerful right there. But to really … Read more
Here’s a scenario that may illustrate the usefulness of source control even if you work alone. Your client asks you to implement an ambitious modification to the website. It’ll take you a couple of weeks, and involve edits to many pages. You get to work. You’re 50% done with this task when the client calls … Read more
Also, if you are using TortoiseSVN, just export to the current working copy location and it will remove the .svn folders and files. http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-export.html#tsvn-dug-export-unversion Updated Answer for Subversion 1.7: In Subversion 1.7 the working copy has been revised extensively. There is only one .svn folder, located in the base of the working copy. If you … Read more
Both examples must work, but svn merge -r UPREV:LOWREV . undo range svn merge -c -REV . undo single revision in this syntax – if current dir is WC and (as in must done after every merge) you’ll commit results Do you want to see logs?
By default TortoiseSVN always has a GUI (Graphical User Interface) associated with it. But on the installer (of version 1.7 and later) you can select the “command line client tools” option so you can call svn commands (like svn commit and svn update) from the command line. Here’s a screenshot of the “command line client … Read more
See the SVNBook, specifically the ‘Undoing Changes’ section, and reverse merging. Another common use for svn merge is to roll back a change that has already been committed. Suppose you’re working away happily on a working copy of /calc/trunk, and you discover that the change made way back in revision 303, which changed integer.c, is … Read more
The claim of why merging is better in a DVCS than in Subversion was largely based on how branching and merge worked in Subversion a while ago. Subversion prior to 1.5.0 didn’t store any information about when branches were merged, thus when you wanted to merge you had to specify which range of revisions that … Read more
In your svn\repos\YourRepo\conf folder you will find two files, authz and passwd. These are the two you need to adjust. In the passwd file you need to add some usernames and passwords. I assume you have already done this since you have people using it: [users] User1=password1 User2=password2 Then you want to assign permissions accordingly … Read more
Both are very similar but Subversive is the “eclipse svn provider”. I primarily use Subversive because of a few convenient features: Grouping of history When I’m browsing the history of a branch instead of just seeing a bunch of rows for every commit it can group commits by today, week, etc. Mapping of trunk, branches, … Read more
Git has two approaches similar to, but not exactly equivalent to svn:externals: Subtree merges insert the external project’s code into a separate sub-directory within your repo. This has a detailed process to set up and then is very easy for other users, because it is automatically included when the repository is checked out or cloned. … Read more