Subversion xib merge error - objective-c

So I don't know all that much about subversion, but I use Versions svn to keep my Xcode projects synced between my laptop and desktop and this is the first issue I've had with it. I did a bunch of work on my laptop while away over the weekend and tried to sync when I got home; however, when I committed the changes from my laptop and updated on my desktop, something weird happened. The project opens up (on my desktop computer) but gives me the following error:
The document "ClassInputViewController.xib" could not be opened. Could not read archive.
along with about 50 merge conflicts on various lines of that xib. upon closer inspection of the files, I saw that 3 new files had been added during the update that weren't in the files from my commit on the laptop: ClassInputViewController.xib.mine, ClassInputViewController.xib.r101 and ClassInputViewController.xib.r102 that Versions says aren't under version control. If I delete these files, the merge conflicts in Xcode disappear but the main "Could not read archive" error still occurs. I know one simple solution to this would be to back up the project on my laptop, delete it from svn and add back in the working files, but I'd like to figure out how to fix this is case it happens again with a bigger project that wouldn't be so easy to do that with. Anyone know what to do in this situation?

oooh, I saw it many times. Best solution - it's just throw away the most unserious changes.

Related

IntelliJ has been deleting my project file, and now it deleted my ENTIRE PROJECT

I don't know what to say, nor what additional details to provide. My entire code is gone, my entire project, my entire work. I have nothing to paste because everything is deleted.
Can someone tell me how I can discern what the f*** is happening?
At first, one .fxml file kept being deleted repeatedly every time I would run the code.
Now, my ENTIRE PROJECT got deleted and I am totally lost.
The file that kept being deleted over and over again was inside of a package which contained other classes and another .fxml file which weren't ever deleted.
I am developing a JavaFX application.
UPDATE: All of the .fxml files of the project (.fxml files in all packages) got deleted physically from my SSD. So did my "lib"(which did contained active libraries) and my database file.
Only the class files have remained on the disk within the folder structer as they were. They are reachable through Windows explorer, but inside of InteliJ I literally saw how one by one everything was disappearing from the project structure until there was nothing left (just the "External Libraries" and the "Scratches and Consoles" are visible in the project structure).
UPDATE - 2 days later: I've not discerned the cause of all the above, but thankfully, I did push to GIT less than 5minutes to it all getting deleted. I did that because with how that single .fxml file was getting deleted I was worried of exactly what's happeneded happening, which is that my entire project gets deleted. I have sweeped through the logs and haven't found anything that seemed to be a clue as to what took place. I've restarted IntelliJ and imported the project anew, and that's what I'll end this with. I see not purpose in contacting IntelliJ support because I have no idea how to reproduce the issue.

Compiled Access Program Runs Fine on 7 Computers but Crashes on 3 others

I have written a rather complex application in Microsoft Access. It is split into front end and back end files. To protect my code, I have compiled it and saved it as a runtime .accde file, which I then changed to an .accdr file to ensure it operated as a runtime. I have created two versions of the application: one for those with 32-bit Office installed and one for those with 64-bit office. I have used Inno Setup to package the application, the data file, and other files such as the icon file, the license file, etc., into an installable package, which works just fine.
Among my team of 27 beta testers of this application, so far 6 have downloaded it, and I have tested it on four of my own computers. On seven of these computers, the installation works perfectly and the application runs with no problems.
On the computers of three of my testers, when they try to run it, they get this error message:
The expression On Open you entered as the event property setting produced the following error: Bad file name or number.
* The expression may not result in the name of a macro, the name of a user-defined function, or [Event Procedure].
I'm pretty sure I know where the code is that's causing the problem, but cannot for the life of me figure out why the application crashes on those 2 computers but not on others.
The On Open event I suspect of causing the problem checks the linked tables, gets their connect string, then looks at the path for that string for the back end database. If it does not find it there, the procedure pops up a file selector dialog and instructs the user to find the data file, then it relinks all the tables.
If anyone could point me in the right direction to fixing this problem, I would be extremely grateful.
This is typically caused by a reference labelled as MISSING.
You have two (three) options:
Run the application on the offending machines with a full version of Access that lets you debug the code
Create a small test application that lists and verifies the references you use, and run this on the offending machines
Remove those two customers
Thanks to all the contributors here. Because of these folks and additional online research, the latest answer I can find is this:
This error occurs on a small percentage of computers on which the app is installed, and no one has yet figured out why, what causes it, or how to fix it. The workaround is to install the 2013 version of the Access runtime, as later versions will still cause the problem.
At least one of the offending computers is running the Click-to-Run version of Office. Still gathering information, but that's the status as of now.

Get back lost shelf changes

I have shelved my 26 java files changes via Intellij Idea 2016.2.1 and I checkout to different branch.
When I came to old branch to check my shelved changes.
I gone a mad now, I lost all the files. I was worked nearly two months
Can somebody help to get it back?
You can restore the state of those files if they were edited in IntelliJ. Use local history to see all the changes made in IntelliJ (VCS -> Local History -> Show History).
Even there isn't Shelf tab in IDE you can find shelved changes as patch files at {ProjectName}/.idea/.idea.{ProjectName}/shelf/.idea/shelf.
Then your can apply any selected patch.
I was able to view lost changes and revert back to them by:
right click on project directory, select Local History > Show History
Find the entry in the history menu that you want to restore. You can examine the files by double clicking on the entry and the files to examine differences.
Right click on the entry you want to restore, and select Revert
Note in my case Git>VCS Operations>Show History showed nothing. Only through the Project Files menu.
Andrei's answer was helpful for my situation where I renamed my project and my previously shelved changes were no longer found under the shelf, but I did run into an issue when applying the patch file because I was prompted to "Select missing base" for various files in the patch. Similar to what is seen in the screenshot below:
https://youtrack.jetbrains.com/issue/IDEA-183910
I was able to avoid having to "Select missing base" for various files by first changing the default shelf location and then applying the patch.
https://www.jetbrains.com/help/idea/shelving-and-unshelving-changes.html#change-shelve-location
Also, I found my patch in this location:
{ProjectName}/.idea/shelf
instead of the aforementioned location:
{ProjectName}/.idea/.idea.{ProjectName}/shelf/.idea/shelf
Maybe this will help someone:
I lost part of my shelved changes in combination with an update of IntelliJ. I'm not sure if the update was the reason but eventually most of my most recent (and important) changes were gone.
I couldn't restore them from local history as this does not "survive" an update of IDEA. But in the files I saw that there still is some data:
C:\Users\myUser\AppData\Local\JetBrains\IntelliJIdea2021.2\LocalHistory had a changes.storageData with ~50MB.
Copying the files to the folder of the new version didn't help as the files got overwritten again.
Solution:
I was able to get the old version of IntelliJ (2021.2) here and installed it. This can be done in parallel, without removing the newer version.
Here I was able to retrieve my changes from the Local History and shelve or apply them again.
Hint: Backup the "Local History" folder (or the whole IntelliJIdea20xx.x folder) before you start. I don't remember if I had to copy it in there again or if it worked out of the box. (Just to be sure the local history doesn't get lost).
I've also experienced this bug repeatedly and hence no longer use shelved changes, but rather the Git CLI directly. As of 2022 Jetbrains IDE's still cannot be trusted with their "Smart Checkout" feature, which has a small probability of the total loss of your files (experienced personally in both IntelliJ & Rider).
Unlike another comment here regarding using the Local History, this did not work for me as the history showed nothing. I've also lost many hours of work due to this bug which remains unfixed.
The solution is to use "git stash -u" on the command line, then checkout the desired commit. Once youre done, type "git stash apply" to restore your files. Trusting the "smart checkout" feature is like playing Russian roullette. It's IDE magic that may just fail and you lose everything.

Appcelerator Titanium & Git - what are these random new uncommitted files?

In my Titanium project, I have been new uncommitted changes to following files being shown in my Git status:
plugins/ti.alloy/hooks/alloy.js
plugins/ti.alloy/hooks/deepclean.js
I've never seen or touched those files and someone else in my team got them as well randomly after an update some time ago.
Are these updates to the Titanium Alloy framework that should live in .gitignore? Or should I commit them?
Those files are changed with an update of Alloy (CLI). When you work with multiple people on the same app, it will be recommited every time someone works with a different Alloy version.
You can commit it without causing anything wrong, or you can also add them to gitignore without issues (not tested, but should not cause issues).

Bazaar Explorer hangs when parent branch is unreachable

I created a shared repository on my laptop. In that repository, I created a branch named trunk. Then I created an unbound branch of trunk on my desktop so I could do work on either machine and sync my changes manually.
This works pretty well except for one nagging issue. On my desktop, Bazaar Explorer is forever trying to reach the remote branch. Every time I hit Refresh (for example) Bazaar Explorer hangs for several seconds while it does ... something. If my laptop isn't on the network, Bazaar Explorer hangs for even longer and then displays the error message, "Not a branch: <branch URL>". Afterward, I can proceed as normal.
One of the reasons I switched to a DVCS from Subversion is that you can keep on working and commiting even when "the server is down". Technically, I can keep working, but the constant freezing is killing it for me. Is there a solution?
Edit .bzr/branch/branch.conf and remove the line with parent_location = ....
Note: later if you merge or pull from another branch, it will again save the parent_location. To prevent it from doing that, add the --no-remember flag when you merge or pull.
As #bialix pointed out in a comment:
if you want to disable remembering of parent_location you can also edit branch.conf and put there: parent_location = that is nothing (or space) after equal sign.