TortoiseSVN merge option missing from tools - tortoisesvn

I recently upgraded to TortoiseSVN 1.8.10 and I no longer have the option to merge. Has anyone else ever experienced this?

You right-clicked something that is not a SVN working copy, but a plain old folder. Try with an existing working copy, or make one first.
Latest version of TortoiseSVN as of this moment is 1.14.1. If you are positive that you right-clicked a working copy, one possible reason would be that you downgraded TortoiseSVN instead of upgrading, and the old version does not recognize a working copy made in a more recent version.

Related

Eclipse Workspace not recognized after clean install

I just made a clean install, as I do every year, of my linux system (ubuntu) on my notebook.
I just wanted to open-up eclipse from my (old) workspace, where all my code from the past 12 months is - but eclipse doesn't show a single package!
My assumption is that I used an older version of eclipse up until yesterday before the clean install, and that the version I installed today is newer, thereby doesn't recognize my worksapce(s!). Is this assumption correct? if so, Does anyone know how I can figure out which version of Eclipse I was using when working on the old Workspace, so that I can download that exact same version again?
The absolut worst-case scenario would be to c/p all classes and packages manually into the new eclipse, but it's over a 1000 classes - so that might be too time-consumming.
An help would be greatly appreciated, since there actually are 2 projects from work in those workspaces... ^^
Well, after Downloading Eclipse Mars, I found a solution. Although switching workspaces, or even importing the old workspaces didn't work, I found out that if I started eclipse from the old workspace, even though package explorer would stay empty, it would suffice to define a new java project with the exact same name of one of the projects inside the old workspace, for eclipse to instantly load-up the docs contents.
This not as much a solution, then a work-around... but still, fixed the problem!

Install older version of Cygwin

Is there any way I can go back and install a older version of Cygwin?
Say I want the 1.7.9 version, but the setup.exe in the Cygwin website always point to the latest release?
http://www.cygwin.com/setup.exe will always point to the latest release. The only previous release available at cygwin.com is the 'setup-legacy' file, which is version 1.5.25 and is compatible with older versions of Windows. Downloading older versions of Cygwin is discouraged because of incompatibility with the latest available packages.
That said, if you are certain you want an older version of setup.exe, the only way to get it would be to find the file mirrored elsewhere. Simply google the specific version you want, and you should be able to easily find what you are looking for. download.cnet.com, for example, has many previous releases: see for yourself.
In summary, there is no 'official' way to get previous Cygwin releases, so you will have to find a mirror of that specific release.
Yes, see this answer but ignore the parts about Postgres
https://serverfault.com/a/532412/123651
Install an old version if you have to. Someone maintains a historical archive of Cygwin versions.
Browse the time stamp of the setup.ini file you need: http://www.crouchingtigerhiddenfruitbat.org/Cygwin/timemachine.html
Copy the address of the folder (not index.html)
Run /setup-x86.exe -X with the -X option to ignore setup signatures (they aren't archived).
Paste the address into the dialog to choose your download site. You will then see a snapshot of packages available during that time.
Then pick the Cygwin base package to get an older version.
Download any setup version from https://cygwin.com/setup/

SVN 1.7.1 Issue

I have just upgraded to SVN 1.7.1 and I have had nothing but problems trying to get my netbeans and everything else to work with it. I have tried 'svn upgrade' but I get an error which is as follows:
C:\wamp\Projects>svn upgrade BMPortal
svn: E155019: Can't upgrade 'C:\wamp\Projects\BMPortal' as it is not a
pre-1.7 working copy directory
svn: E150000: Missing default entry
Could anyone suggest a way to fix this. The reason why I am trying to upgrade is because my netbeans says:
The Path 'C:\wamp\Projects\BMPortal' appears to be part of a
Subversion 1.7 or greater working copy. Please upgrade your Subversion
client to use this working copy.
As I have upgraded my SVN Client to 1.7, I don't know why it is still moaning at me.
Just FYI:
The SVN Server is on an Arch Linux box running UberSVN.
The client (my computer) is Windows 7 64bit.
I actually had the very same problem (or at least the same error message!).
After trying everything you have said earlier and not getting any results, I realise that I had copied some files to the project that contains svn files from an older (1.6) version. I delete the 1.6 folders and the everything worked fine again.
I hope this could help some other people too!
Best regards,
Andrés
Your Netbeans installation seems to use another SVN-Client as the one when you type svn on the console.
So you have to upgrade your Netbeans-Subversion plugin too.
Sorry to waste your time guys, I have finally found a work around for this, http://netbeans.org/projects/versioncontrol/pages/Subversion1_7
But thanks again all the same! It's much appreciated!
SVN v1.7.0 and above uses a new working copy file format, so you need to upgrade your working copy to the new format. If you right-click the folder in Windows Explorer, the TortoiseSVN context menu items should show only "SVN Upgrade working copy" - click that to upgrade it.
Warning: If you use any other SVN apps as well as TortoiseSVN on the same PC, they may not work with the new working copy file format.
It's worth upgrading in my opinion though - must faster, better merging, better dialogs and error reporting, etc!

Create Upgrade Patch For InstallShield Installer

For our latest release, we want our customers to only download an upgrade patch of our applications and instead of uninstall and re-install all the process will be done by upgrader patch but I know nothing about this even after I googled it! Where to start guys? Note that our new release includes database upgrade as well as production code!
We are using .NET 4.0, Visual Studio 2010, C# and VB.NET in our software.
I might be a bit late to the party but hopefully this post helps anybody else who is looking for this answer.
You can use the 'Patch Design' method to create patches. You can find it in Installation Designer tab under Media.
For this you will need the latest build (msi/exe) and one or more previous build(s). In 'Patch Design' add a new patch configuration. From there you can specify latest version and previous version(s) of your setup file. If you are using Express version then you will need uncompressed build for both latest and previous. If you have Professional version then it can decompress it for you.
After this, just hit Build Patch and it will create a update.exe with only differences between latest and previous builds. It is quite smart in a way where it will only add the binary differences.
Good luck.

Are Tortoise svn minor revisions compatible?

I have a branch checked out in Tortoise 1.4.2, edited it in 1.6.2 and now can't modify it on my old machine running 1.4.2. The latest version on the Tortoise website is 1.6.7. Are versions 1.6.x interoperable? I'm stuck with version 1.6.2 on my new machine.
Basically, a basic principle with SVN is that :
When you have a working copy in 1.4.x and you use a 1.6.x tool to work on it, it'll automatically be converted to 1.6.x
Which means you will not be able to work with your 1.4.x tool anymore
Between 1.6.x and 1.6.y, I've never seen any problem.
Tortoise SVNuses the Subversion libraries underneath, and the first two parts of Tortoise's version numbers match up with the version of the Subversion libraries, so Tortoise SVN versionion1.6.x will use the Subversion client libraries version 1.6.y.
The Subversion team often changes the working copy format between minor releases (1.5.x -> 1.6.x) but try hard not to break compatibility between patch releases (1.6.2 -> 1.6.3). Newer versions can read old working copies, but only to immediately upgrade them.
So the answer to your question is "Yes".

Resources