An svn update will bring the file back, fixing your local repo.  

You should then be able to do an &quot;svn delete&quot; on the file, which tells your local repo that the file is to be deleted, and also deletes it from the file system.  

You should then be able to commit the changes back to the repo.


If you are comitting a folder with the deleted file in it and supposing that you use the latest versions of Tortoise SVN (SVN GUI Client), it recognizes the particular file as missing and tries to delete from the SVN repo.

I had the same problem and the reason was that I deleted the file externaly. If you delete it using NetBeans, then commit work fine.



Deleting the project locally, rechecking out from SVN and committing the changes fixed it for me. Make sure to back up your changes before deleting the project.

I was wondering if in Java I would get any odd behaviour if I synchronise twice on the same object?

The scenario is as follows

    pulbic class SillyClassName {
    
        object moo;
        ...
        public void method1(){
            synchronized(moo)
            {
                ....
                method2();
                ....
            }
        }
    
        public void method2(){
            synchronized(moo)
            {
                doStuff();
            }
        }
    }

Both methods use the object and are synchronised on it. Will the second method when called by the first method stop because it&#39;s locked?

I don&#39;t think so because it&#39;s the same thread but I&#39;m unsure of any other odd results that might occur.

Synchronising twice on the same object?

Following on from a [previous question](https://stackoverflow.com/questions/221417/how-do-i-programmatically-access-the-target-path-of-a-windows-symbolic-link), I am creating a symbolic link on a Server 2008 from a Vista machine using UNC paths. I can create the link just fine. I can go to the Server 2008 box and double click on the link in explorer to open the target file. What I cannot do though is use FileCreateW to get a handle to the UNC path link (from the Vista box). When I try it, it fails and GetLastError() returns error code 1463 (0x5B7), which is:

&gt; The symbolic link cannot be followed because its type is disabled.

How to enable its &quot;type&quot; in Server 2008 (assuming the error means what it says)?

How do I overcome the &quot;The symbolic link cannot be followed because its type is disabled.&quot; error when getting the target of a symbolic link?

I have a project that I am building with Netbeans 6.1 and I am using SVN. I deleted some files on the local machine then attempted to commit my changes to th SVN repository. The commit fails with the error message

&gt; Entry for &#39;C:\path\to\project\myfile&#39; has no URL

Where myfile is the deleted file.

Is there some way to tell SVN that the file was deleted from the project and that it should be deleted from the repository?

SVN commit error after deleting files locally

I have a project that I am building with Netbeans 6.1 and I am using SVN. I deleted some files on the local machine then attempted to commit my changes to th SVN repository. The commit fails with the error message
> Entry for 'C:\path\to\project\myfile' has no URL
Where myfile is the deleted file.
Is there some way to tell SVN that the file was deleted from the project and that it should be deleted from the repository?

I&#39;ve used both SVN and CVS a little bit, but will need to choose one for a new project I will be starting.

Can anyone who has used both extensively please offer some pros and cons and which they think is better?  Best learning resources would be appreciated too.

This will be for a small project, just one or two developers to start.

Subversion vs CVS

I committed a bunch of files (dozens of files in different folders) by accident. What is the easiest, cleanest (and safest!) way to &#39;undo&#39; that commit without having to delete the files from my working directory?


Undoing a commit in TortoiseSVN

If you have multiple, unrelated projects, is it a good idea to put them in the same repository?

    myRepo/projectA/trunk
    myRepo/projectA/tags
    myRepo/projectA/branches
    myRepo/projectB/trunk
    myRepo/projectB/tags
    myRepo/projectB/branches

or would you create new repositories for each?

    myRepoA/trunk
    myRepoA/tags
    myRepoA/branches
    myRepoB/trunk
    myRepoB/tags
    myRepoB/branches

What are the pros and cons of each? All that I can currently think of is that you get mixed revision numbers (so what?), and that you can&#39;t use `svn:externals` unless the repository is actually external. (i think?)

The reason I ask is because I&#39;m considering consolidating my multiple repos into one, since my SVN host has started charging per repo.

One SVN repository or many?

Is there any good software that will allow me to search through my SVN respository for code snippets?  I found &#39;FishEye&#39; but the cost is 1,200 and well outside my budget.

SVN Repository Search

How to move a sub directory from one directory to another, given that both are inside the same SVN repository? I am using tortoise SVN.

Move Directory across SVN repository using Tortoise SVN

We have a git project which has quite a big history.

Specifically, early in the project there were quite a lot of binary resource files in the project, these have now been removed as they&#39;re effectively external resources.

However, the size of our repository is &gt;200MB (the total checkout is currently ~20MB) due to having these files previously committed.

What we&#39;d like to do is &quot;collapse&quot; the history so that the repository appears to have been created from a later revision than it was. For example

    1-----2-----3-----4-----+---+---+
                       \       /
                        +-----+---+---+

1. Repository created
2. Large set of binary files added
3. Large set of binary files removed
4. New intended &#39;start&#39; of repository

So effectively we want to lose the project history before a certain point. At this point there is only one branch, so there&#39;s no complication with trying to deal with multiple start points etc. However we don&#39;t want to lose all of the history and start a new repository with the current version.

Is this possible, or are we doomed to have a bloated repository forever?

Collapsing a git repository&#39;s history

I am looking for an expression for the .hgignore file, to ignore all files beneath a specified folder.

eg: I would like to ignore all files and folders beneath bin

Actually any advice on how the expressions are formed would be great

How can I ignore everything under a folder in Mercurial

I have a largish Mercurial repository that I&#39;ve decided would be better as several smaller repositories.  Is there a way that I can split the repository and have each piece retain its revision history?

Can I split a Mercurial repository?

We&#39;re using Perforce and Visual Studio. Whenever we create a branch, some projects will not be bound to source control unless we use &quot;Open from Source Control&quot;, but other projects work regardless. From my investigations, I know some of the things involved:

In our .csproj files, there are these settings:

* &amp;lt;SccProjectName&gt;
* &amp;lt;SccLocalPath&gt;
* &amp;lt;SccAuxPath&gt;
* &amp;lt;SccProvider&gt;

Sometimes they are all set to &quot;SAK&quot;, sometimes not. It seems things are more likely to work if these say &quot;SAK&quot;.

In our .sln file, there are settings for many of the projects:

* SccLocalPath#
* SccProjectFilePathRelativizedFromConnection#
* SccProjectUniqueName#

(The # is a number that identifies each project.) SccLocalPath is a path relative to the solution file. Often it is &quot;.&quot;, sometimes it is the folder that the project is in, and sometimes it is &quot;..&quot; or &quot;..\\..&quot;, and it seems to be bad for it to point to a folder above the solution folder. The relativized one is a path *from* that folder to the project file. It will be missing entirely if SccLocalPath points to the project&#39;s folder. If the SccLocalPath has &quot;..&quot; in it, this path might include folder names that are not the same between branches, which I think causes problems.

So, to finally get to the specifics I&#39;d like to know:

* What happens when you do &quot;Change source control&quot; and bind projects? How does Visual Studio decide what to put in the project and solution files?
* What happens when you do &quot;Open from source control&quot;?
* What&#39;s this &quot;connection&quot; folder that SccLocalPath and SccProjectFilePathRelativizedFromConnection refer to? How does Visual Studio/Perforce pick it?
* Is there some recommended way to make the source control bindings continue to work even when you create a new branch of the solution?

---

*Added June 2012:*
I don&#39;t use Perforce any more, so I can&#39;t vouch for it, but have a look at &lt;a href=&quot;https://stackoverflow.com/a/11148342/2283&quot;&gt;KCD&#39;s answer&lt;/a&gt; below. Apparently there&#39;s &lt;a href=&quot;http://forums.perforce.com/index.php?/topic/1585-new-perforce-plugin-for-visual-studio-20121-beta-available-now/&quot;&gt;a new P4 VS plugin&lt;/a&gt; under development. Hopefully it should clear up all this mess!

How does Visual Studio&#39;s source control integration work with Perforce?

I am trying to figure out how to add a custom file type to be recognised by Netbeans.

I am editing .tpl files and I would like them to be recognised as PHP/HTML files.

I&#39;ve looked [here][1] and [here][2] but I cant find cnd.properties in config directory and there is no `Advanced Options` dialog in the options dialog.

  [1]: http://www.techienuggets.com/Comments?tx=38126
  [2]: http://forums.netbeans.org/ptopic3275.html

I&#39;m using Netbeans 6.5 with PHP and all modules up to date.

Add a custom file extension to Netbeans

Is there something similar to the Eclipse cleanup rules (Preferences &gt; Java &gt; Code Style &gt; Clean Up) in NetBeans?

The cleanup rules in eclipse will allow you to clean things up like organizing imports, removing unnecessary casts, adding missing override annotations etc.

Also can you do that on a whole set of classes/packages instead of individual classes?


Code cleanup in netbeans

We normally use Eclipse for a particular Java project, but recently I imported the project into NetBeans to use its dialog building features.

Since I&#39;ll probably come back to this, I wanted to store the NetBeans project files into version control. However, I don&#39;t want to commit files that are &quot;mine&quot; versus &quot;project&quot;, i.e., files with my own settings that would conflict with another user&#39;s.

NetBeans created the following structure in the top-level project area:

    nbbuild
    nb-build.xml
    nbproject
        &lt;various files&gt;
        configs
        private

Clearly `nbbuild` is build output, so that won&#39;t go in. The `nb-build.xml` file seems likely, as does most of `nbproject`. However, `nbproject/private` suggests it&#39;s &quot;mine&quot;. Peeking at &quot;configs&quot;, it&#39;s not clear to me if that&#39;s mine or project...

Anyone have some guidelines?

Which NetBeans projects files should go into source control?

In eclipse you can click &lt;kbd&gt;Ctrl&lt;/kbd&gt;+&lt;kbd&gt;I&lt;/kbd&gt; at any line, and it&#39;ll automatically indent the line or group of lines according to the indentation scheme you chose in the settings.

I&#39;m really missing this feature in Netbeans. Is there any equivalent feature?

I&#39;m aware of &lt;kbd&gt;Alt&lt;/kbd&gt;+&lt;kbd&gt;Shift&lt;/kbd&gt;+&lt;kbd&gt;F&lt;/kbd&gt; but it&#39;s not good enough. I want to indent a group of lines, and not all the file.

How do I autoindent in Netbeans?

I&#39;m trying to follow a tutorial to make an extremely basic Java web application in NetBeans.

When I try to run it, a dialogue box appears title &quot;Authentication Required&quot;.  Inside the dialogue box there the heading &quot;Tomcat Manager Application&quot; and fields for &quot;User Name&quot; and &quot;Password.&quot;

Investigating this, I&#39;ve come to understand that I should edit the file
    
    \TOMCAT_HOME\conf\tomcat-users.xml

to include something like:
    
    &lt;user username=&quot;user&quot; password=&quot;password&quot; roles=&quot;standard,manager&quot;/&gt;

so I&#39;ve done that, but it hasn&#39;t helped yet.

Can anyone provide some insight?  I&#39;m using Tomcat 6.0.20, NetBeans 6.7.1, and Windows Vista.  I&#39;m using jdk1.7.0, but Java hasn&#39;t really entered into this project yet.

How do I set Tomcat Manager Application User Name and Password for NetBeans?

Is there a way to edit the log message of a certain revision in Subversion? I accidentally wrote the wrong filename in my commit message which could be confusing later.

I&#39;ve seen *[How do I edit an incorrect commit message in Git?][1]*, but the solution to that question doesn&#39;t seem to be similar for Subversion (according to `svn help commit`).

  [1]: https://stackoverflow.com/questions/179123/how-do-i-edit-an-incorrect-commit-message-in-git


How to edit log message already committed in Subversion?

If I check out a tagged version of my source code without creating a branch, Git indicates that I&#39;m not associated with any branch at all. It&#39;s happy to let me make changes and check them in though. Where do those changes go? If I switch back to &#39;master&#39; they disappear (overwritten by what was in master) and I can&#39;t seem to find them again. What gives? If Git lets me commit changes against what&#39;s essentially an anonymous branch, surely I can get them back?

Git commit against tag with no branch

The answers to https://stackoverflow.com/questions/179123/how-do-i-edit-an-incorrect-commit-message-in-git describe a way to amend previous commit messages that haven&#39;t yet been pushed upstream.  The new messages inherit the timestamps of the original commits.  This seems logical, but is there a way to also re-set the times?

How can one change the timestamp of an old commit in Git?

I would like to remove selected commit log entries from a linear commit tree, so that the entries do not show in the commit log.

My commit tree looks something like:

    R--A--B--C--D--E--HEAD

I would like to remove the B and C entries so that they do not show in the commit log, but changes from A to D should be preserved. Maybe by introducing a single commit, so that B and C become BC and the tree looks like.

    R--A--BC--D--E--HEAD

Or, ideally, after A comes D directly. D&#39; representing changes from A to B, B to C and C to D.

    R--A--D&#39;--E--HEAD

Is this possible? if yes, how?

This is a fairly new project so has no branches as of now, hence no merges as well.

How to remove selected commit log entries from a Git repository while keeping their changes?

I accidentally made 10 commits on branch &quot;testing&quot; when I intended to commit them on branch &quot;master&quot;. The other commits on the &quot;testing&quot; branch are garbage, so I don&#39;t want to merge it with &quot;master&quot;. Instead, I just want to replay the last 10 commits on master.

Content Type	Original Author	Original Content on Stackoverflow
Question	Vincent Ramdhanie	View Question on Stackoverflow
Solution 1 - Svn	BenB	View Answer on Stackoverflow
Solution 2 - Svn	Azlam	View Answer on Stackoverflow
Solution 3 - Svn	Katapofatico	View Answer on Stackoverflow
Solution 4 - Svn	kriver	View Answer on Stackoverflow

SVN commit error after deleting files locally

Svn Problem Overview

Svn Solutions

Solution 1 - Svn

Solution 2 - Svn

Solution 3 - Svn

Solution 4 - Svn

How do I overcome the "The symbolic link cannot be followed because its type is disabled." error when getting the target of a symbolic link?

Synchronising twice on the same object?

Attributions