The working copy is revision BASE. The latest copy from the repository is revision HEAD. This will compare your working copy against the HEAD revision:

    svn diff -r HEAD &lt;file&gt;

Actually that&#39;ll spit the changes out in reverse, i.e. it tells you how to go from HEAD to BASE. So technically you want:

    svn diff -r BASE:HEAD &lt;file&gt;

Can you spare the keyboard strokes? Only you and your deity know that answer.

The difference between _working copy_ and `HEAD`; the changes which would need to be made to what is now in the repository (`HEAD`), to produce your _working copy_:

    svn diff -r HEAD --old=&lt;file&gt;

Of possible interest, the difference between `BASE` and `HEAD`; changes that have been checked into the repository since you last updated _working copy_:

    svn diff -r BASE:HEAD &lt;file&gt;

And of course the difference between `BASE` and _working copy_; the changes you have made since you last updated _working copy_:

    svn diff &lt;file&gt;

&lt;br&gt;

There are three versions being discussed: `BASE`, _working copy_, and `HEAD`.

  - `BASE`: `&lt;file&gt;` as last checked out / updated. What _working copy_ would revert to after using `svn revert`
  - _working copy_: local modifications to `&lt;file&gt;` which has been checked out / updated as recently as `BASE`
  - `HEAD`: latest modifications in repository. Equivalent to `BASE` _iff_ no changes have been committed since `&lt;file&gt;` was checked out / updated as _working copy_.


I have a list of documents, each with lat and lon properties (among others).

    { &#39;lat&#39;: 1, &#39;lon&#39;: 2, someotherdata [...] } 
    { &#39;lat&#39;: 4, &#39;lon&#39;: 1, someotherdata [...] }
    [...]

I want to modify it so that it looks like this:

    { &#39;coords&#39;: {&#39;lat&#39;: 1, &#39;lon&#39;: 2}, someotherdata [...]} 
    { &#39;coords&#39;: {&#39;lat&#39;: 4, &#39;lon&#39;: 1}, someotherdata [...]}
    [...]

So far I&#39;ve got this:

    db.events.update({}, {$set : {&#39;coords&#39;: {&#39;lat&#39;: db.events.lat, &#39;lon&#39;: db.events.lon}}}, false, true)

But it treats the _db.events.lat_ and _db.events.lon_ as strings. How can I reference the document&#39;s properties?

Cheers.

MongoDB: Updating documents using data from the same document

I have an `int` pointer (i.e., `int *count`) that I want to increment the integer being pointed at by using the `++` operator. I thought I would call:

    *count++;

However, I am getting a build warning *&quot;expression result unused&quot;*. I can: call

    *count += 1;

But, I would like to know how to use the `++` operator as well. Any ideas?

increment value of int being pointed to by pointer

I have a working copy of a repository on my machine, and I know that it has been updated on the server. I would like to know how to get the difference between the new version and the version in my working copy by using `svn` command line arguments.

Is there a way for me to do this?

Check diff against file on the server

<p>I have a working copy of a repository on my machine, and I know that it has been updated on the server. I would like to know how to get the difference between the new version and the version in my working copy by using <code>svn</code> command line arguments.</p>
<p>Is there a way for me to do this?</p>


I created a branch of an SVN project called &#39;features&#39;, and now whenever I try to update said project, it brings with it a features folder, which contains another copy of the project from the branch.

Is there a way to remove the branch from the repository completely so that this doesn&#39;t happen any more?


Deleting an SVN branch

I installed SVN on a Ubuntu machine and I can&#39;t get my head around something.

Whenever I checkout something from the terminal I get this error about saving a non-encrypted password:

    -----------------------------------------------------------------------
    ATTENTION!  Your password for authentication realm:
    
       &lt;[...]&gt; Subversion Repository
    
    can only be stored to disk
    unencrypted!  You are advised to
    configure your system so that
    Subversion can store passwords
    encrypted, if possible.  See the
    documentation for details.
    
    You can avoid future appearances of
    this warning by setting the value of
    the &#39;store-plaintext-passwords&#39; option
    to either &#39;yes&#39; or &#39;no&#39; in
    &#39;/home/[...]/.subversion/servers&#39;.
    -----------------------------------------------------------------------

I goggled it a bit but I couldn&#39;t find anything useful. I found one topic where it said this was a client issue, not a server one, but I&#39;m still not convinced.

It says &quot;configure your system&quot;; what exactly does it mean by that? The server or the client? If I&#39;m the server, is there anything I can do about it? besides hiding the warning (like it says)...

Thanks!

SVN encrypted password store

Is there any way to extract credentials saved by TortoiseSVN?




Extract TortoiseSVN saved password

While somehow versed in VCS (regular svn, git and git-svn user) I can&#39;t seem to wrap my head around this peculiar SVN behavior.

Whenever I need to rename a directory in my SVN working copy from an otherwise &#39;clean&#39; state - i.e `svn status` returns nothing and all other modifications have been commited - like so (which is what the svn doc suggests):

    svn mv foo bar
    svn commit

SVN complains loudly:

    Adding         bar
    Adding         bar/toto
    Deleting       foo
    svn: Commit failed (details follow):
    svn: Item &#39;/test/foo&#39; is out of date

As you wish:

    svn update

Which gives:

       C foo
    At revision 46.
    Summary of conflicts:
      Tree conflicts: 1

There&#39;s a tree conflict, *while no third-party change happened*. Obviously, the only way to get out of this tree conflict mess is generically (from the svn red book):

    svn resolve --accept working -R .
    svn commit

Renaming it remotely on the repo then updating my working copy seems quite braindead:

    url=$(svn info | grep -e &#39;^URL:&#39; | sed &#39;s/^URL: //&#39;) svn mv $url/foo $url/bar
    svn update

Is there a sanctioned, more streamlined way to rename a folder that I&#39;m missing? What is the root cause behind that particularly surprising tree conflict state?




A sane way to rename a directory in subversion working copy

Here is my scenario:

Assume we have an SVN repo with the following content:
myfolder
myfolder\file.txt

Now I create two checkouts of this repo, co1 and co2.

In co1 we modify file.txt.
In co2 we:

 - svn delete myfolder
 - svn commit
 - Create a new folder named myfolder 
 - svn add myfolder
 - svn commit

Now if I attempt an update in co1 I get a tree conflict:

    A  +  C myfolder &gt;   local edit, incoming delete upon update
    M  +    myfolder\file.txt

I want to keep myfolder and the modified file, so I resolve the tree conflict:
    
    svn resolve --accept working folder

Now if I try to commit, I get &quot;svn: Directory &#39;/myfolder&#39; is out of date&quot;. If I try to resolve this using svn up myfolder, I get a tree conflict again:

    A  +  C folder &gt;   local add, incoming add upon update
    M  +    myfolder\file.txt

Okay, so we try svn resolve --accept working folder again. But we still can&#39;t commit, we get the same message that &quot;svn: Directory &#39;/myfolder&#39; is out of date&quot;, if we do svn up myfolder, we get right back to the last tree conflict.

What is the correct procedure to resolve this type of conflict (when we wish to keep myfolder and its changes)?

EDIT: Windows cmd line script to illustrate:

    rmdir /S /Q C:\svntest 
    mkdir C:\svntest
    
    cd C:\svntest
    
    svnadmin create repo
    
    svn co file:///c:/svntest/repo co1
    svn co file:///c:/svntest/repo co2
    
    cd co1
    mkdir folder
    echo content &gt; folder\file.txt
    svn add folder
    svn commit folder -m &quot;&quot;
    
    cd C:\svntest\co2
    svn up
    
    cd C:\svntest\co1
    svn del folder
    svn commit -m &quot;&quot;
    mkdir folder
    svn add folder
    svn commit -m &quot;&quot;
    
    cd C:\svntest\co2
    echo changed_content &gt; folder\file.txt
    svn up
    svn resolve --accept working folder
    svn commit -m &quot;&quot;
    
    svn up folder
    svn resolve --accept working folder
    svn commit -m &quot;&quot;

And here is the output of running that script (note the commit failures at the end):

    C:\&gt;rmdir /S /Q C:\svntest  
    
    C:\&gt;mkdir C:\svntest 
    
    C:\&gt;cd C:\svntest 
    
    C:\svntest&gt;svnadmin create repo 
    
    C:\svntest&gt;svn co file:///c:/svntest/repo co1 
    Checked out revision 0.
    
    C:\svntest&gt;svn co file:///c:/svntest/repo co2 
    Checked out revision 0.
    
    C:\svntest&gt;cd co1 

    C:\svntest\co1&gt;mkdir folder 
    
    C:\svntest\co1&gt;echo content  1&gt;folder\file.txt 
    
    C:\svntest\co1&gt;svn add folder 
    A         folder
    A         folder\file.txt
    
    C:\svntest\co1&gt;svn commit folder -m &quot;&quot; 
    Adding         folder
    Adding         folder\file.txt
    Transmitting file data .
    Committed revision 1.
    
    C:\svntest\co1&gt;cd C:\svntest\co2 
    
    C:\svntest\co2&gt;svn up 
    A    folder
    A    folder\file.txt
    Updated to revision 1.

    C:\svntest\co2&gt;cd C:\svntest\co1 
    
    C:\svntest\co1&gt;svn del folder 
    D         folder\file.txt
    D         folder
    
    C:\svntest\co1&gt;svn commit -m &quot;&quot; 
    Deleting       folder
    
    Committed revision 2.
    
    C:\svntest\co1&gt;mkdir folder 
    
    C:\svntest\co1&gt;svn add folder 
    A         folder
    
    C:\svntest\co1&gt;svn commit -m &quot;&quot; 
    Adding         folder
    
    Committed revision 3.
    
    C:\svntest\co1&gt;cd C:\svntest\co2 
    
    C:\svntest\co2&gt;echo changed_content  1&gt;folder\file.txt 
    
    C:\svntest\co2&gt;svn up 
    C folder
    At revision 3.
    Summary of conflicts:
      Tree conflicts: 1
    
    C:\svntest\co2&gt;svn resolve --accept working folder 
    Resolved conflicted state of &#39;folder&#39;
    
    C:\svntest\co2&gt;svn commit -m &quot;&quot; 
    Adding         folder
    svn: Commit failed (details follow):
    svn: Directory &#39;/folder&#39; is out of date
    
    C:\svntest\co2&gt;svn up folder 
       C folder
    At revision 3.
    Summary of conflicts:
      Tree conflicts: 1
    
    C:\svntest\co2&gt;svn resolve --accept working folder 
    Resolved conflicted state of &#39;folder&#39;

    C:\svntest\co2&gt;svn commit -m &quot;&quot; 
    Adding         folder
    svn: Commit failed (details follow):
    svn: Directory &#39;/folder&#39; is out of date


SVN how to resolve &quot;local add, incoming add upon update&quot; on a *folder*?

How can you determine all the files that changed in a given changeset?  

I&#39;m not looking for a diff in this case, just a list of add/remove/modifications.

`hg log -vprX` does a list of diffs but I just want the files.

Mercurial - all files that changed in a changeset?

Say I have too programs `a` and `b` that I can run with `./a` and `./b`.

Is it possible to diff their outputs without first writing to temporary files?

Diff output from two programs without temporary files

How do I compare two .jar files? 
Both of them have compiled .class files.

I want the difference in terms of method changes, etc.




Comparing two .jar files

How does the patience algorithm differ from the default `git diff` algorithm, and when would I want to use it?

What is `git diff --patience` for?

I love to use `git diff -w` to ignore whitespace differences. But, I just noticed that it ignores even whitespace differences in the middle of lines. How could I only ignore whitespace differences that come at the start (^) or end ($) of lines?

Content Type	Original Author	Original Content on Stackoverflow
Question	Mantas Vidutis	View Question on Stackoverflow
Solution 1 - Svn	John Kugelman	View Answer on Stackoverflow
Solution 2 - Svn	Chadwick	View Answer on Stackoverflow

Check diff against file on the server

Svn Problem Overview

Svn Solutions

Solution 1 - Svn

Solution 2 - Svn

increment value of int being pointed to by pointer

MongoDB: Updating documents using data from the same document

Attributions