I have the Subversion 1.6.5 client and 1.5.4 server. And I mostly only care about diffs on fully repository paths, not working copies.  When diffing branches, ones that have been merged already show up as identical except for the  properties.  This is a touch annoying for a human who has to then look through the changes looking for anything that might be a real change.  However it's somewhat worse in our usecase as we have scripts that run around checking on the merge state of various things and the mergeinfo properties cause them to highlight a lot of things as being out of sync when they aren't.  Is there a way to get the diff summary to ignore the mergeinfo properties?
123381
I use SVN as the source control system, and I wonder how to compare directories while ignoring any metadata differences. Is there a way to tell svn diff to compare only the actual content and ignore any metadata?   I mean metadata like SVN properties, etc. that don't affect the file content. Assume file X has an additional property in branch B compared to trunk T. Unfortunately it will show up in 'svn diff T B' even though the actual content of file X is the same.  I look for something like this:  svn diff https://example.org/tags/v1 https://example.org/tags/v2 -x -ignore-metadata --summarize   Update: I partially solved this by diff'ing directly on the filesystem instead of using the SVN tools. See my own answer below...
9146
I have to rename a complete folder tree recursively so that no uppercase letter appears anywhere (it's C++ source code, but that shouldn't matter).  Bonus points for ignoring CVS and Subversion version control files/folders. The preferred way would be a shell script, since a shell should be available on any Linux box.  There were some valid arguments about details of the file renaming.   I think files with the same lowercase names should be overwritten; it's the user's problem. When checked out on a case-ignoring file system, it would overwrite the first one with the latter, too. I would consider A-Z characters and transform them to a-z, everything else is just calling for problems (at least with source code). The script would be needed to run a build on a Linux system, so I think changes to CVS or Subversion version control files should be omitted. After all, it's just a scratch checkout. Maybe an "export" is more appropriate.
86755
I want to know the exact difference between questions marked as duplicates vs. merged questions. For example, I think answers are also redirected to the original question with which a second question is merged, whereas if it is marked as a duplicate, then this is not the case.  I want to know all differences between them and why both are displayed as [duplicate], or why [merged] is not used. Which (mark-as-duplicate or merge) is used and when?
16192
I want to resolve merge conflicts in my Git repository. How to do that ?
80129
I am going to be using Subversion for source control on a new J2EE web application. What directory structure will you recommend for organizing code, tests and documentation?
43265
When I type git diff, I want to view the output with my visual diff tool of choice (SourceGear "diffmerge" on Windows). How do I configure git to do this?
5126
(Inkscape 1.0/windows10) While looking for a way to merge &quot;overlapping&quot; nodes of the flipped duplicated copy with the original object,(converting objects to path and selecting), and  joining these overlapping nodes with the &quot;Join selected nodes&quot; option,the nodes just don't merge into a single node and break apart when pulled. It does work in the first attempt , but in latter attempts it doesn't. Why does &quot;join selected nodes&quot; into a single node not work and what over alternatives are there for this operation?
119338
I've got two branches that are fully merged together. However, after the merge is done, I realise that one file has been messed up by the merge (someone else did an auto-format, gah), and it would just be easier to change to the new version in the other branch, and then reinsert my one line change after bringing it over into my branch. So what's the easiest way in Git to do this?
120423
I'm trying to compare files on the root file system with a backup, and I'd like the comparison to work a bit like git or svn diff when a file has been added or removed - That is, display the full file diff. diff unfortunately just prints a No such file or directory message, which is not very useful. I couldn't find an option for this.  The simplest workaround I could find is to parse the diff output and diff -u path &lt;(printf '') or diff -u &lt;(printf '') path depending on which path exists. That's a bit of a kludge - Probably 10 lines of code for what could be a simple diff option.  Another workaround is  diff -u &lt;([ -e "$path1" ] &amp;&amp; cat "$path1") &lt;([ -e "$path2" ] &amp;&amp; cat "$path2")   , but that loses the file names in the diff.  Based on  and the previous workaround, I ended up with this:  diff -u \     "$([ -e "$path1" ] &amp;&amp; echo "$path1" || echo /dev/null)" \     "$([ -e "$path2" ] &amp;&amp; echo "$path2" || echo /dev/null)"   Edit: Turns out there is an option for it:  -N, --new-file        treat absent files as empty   In other words:  diff -Nu "$path1" "$path2"
60513
Windows search indexer is adding most paths to repository folders (both .git and .svn) to the exclusion list.  I can remove them manually of course, but each time i rebuild the index - they are re-added.  I can add them as indexed locations, but i'd have to do that each and every time I add a new repository and I add them in varying locations depending on relation.  Why is windows excluding these and how can i alter that behavior?  seems to have something to do with    wonder how its identifying them as repositories.  As repos from C:\user\dropbox\path\to\repo are excluded automatically, where items from c:\msys64\home\user are not.  If i can understand what triggers it being identified as such, i can perhaps understand the difference and how to fix the behavior.
74447
I've been using git diff, which produces colored output. However, I now find I need to use ordinary diff for something, and it's producing a lot of output that is hard to read because of the lack of colors. How do I make diff produce a readable, colored output? Ideally while piping it to less, for easy review of large files.
12573
CSS and Javascript files don't change very often, so I want them to be cached by the web browser. But I also want the web browser to see changes made to these files without requiring the user to clear their browser cache. Also want a solution that works well with a version control system such as Subversion.   Some solutions I have seen involve adding a version number to the end of the file in the form of a query string. Could use the SVN revision number to automate this for you:   Can you specify how you include the  variable of another file? That is in the HTML file I can include the Revision number in the URL to the CSS or Javascript file. In the  it says about Revision: &quot;This keyword describes the last known revision in which this file changed in the repository&quot;.  Firefox also allows pressing CTRL+R to reload everything on a particular page.  To clarify I am looking for solutions that don't require the user to do anything on their part.
112660
Having migrated to Linux from Windows, I would like to find an alternative software to Winmerge or rather learn command line tools to compare and sync two folders on Linux. I would be grateful if you could tell me how to do the following tasks on the command line... (I have studied diff and rsync, but I still need some help.)  We have two folders: "/home/user/A" and "/home/user/B"  Folder A is the place where regular files and folders are saved and folder B is a backup folder that serves as a complete mirror of folder A. (Nothing is directly saved or modified by the user in folder B.)  My questions are:   How to list files that exist only in folder B? (E.g. the ones deleted from folder A since the last synchronization.) How to copy files that exist in only folder B back into folder A? How to list files that exist in both folders but have different timestamps or sizes? (The ones that have been modified in folder A since last synronization. I would like to avoid using checksums, because there are tens of thousands of files and it'd make the process too slow.) How to make an exact copy of folder A into folder B? I mean, copy everything from folder A into folder B that exists only in folder A and delete everything from folder B that exists only in folder B, but without touching the files that are the same in both folders.
63746
Given the case I made two independent changes in one file: eg. added a new method and changed another method.  I often don't want to commit both changes as one commit, but as two independent commits.  On a git repository I would use the Interactive Mode of  to split the hunk into smaller ones:   git add --patch   What's the easiest way to do this with Subversion? (Maybe even using an Eclipse plug-in)  Update: In , Ryan calls it: “The Tangled Working Copy Problem.”
116768
An svn repository I'm mirroring through git-svn has changed URL.  In vanilla svn you'd just do svn switch --relocate old_url_base new_url_base.  How can I do this using git-svn?   Simply changing the svn url in the config file fails.
94880
I frequently work with multiple instances of Visual Studio, often working on different branches of the same solution.   used to display the full path of the current source file in its title bar, but Visual&nbsp;Studio 2005 doesn't appear to do this. This makes it slightly more awkward than it should be to work out which branch of the solution I'm currently looking at (the quickest way I know of is to hover over a tab so you get the source file's path as a tooltip).  Is there a way to get the full solution or file path into the title bar, or at least somewhere that's always visible, so I can quickly tell which branch is loaded into each instance?
5059
I have a git repository with multiple branches.   How can I know which branches are already merged into the master branch?