Before reinstalling P4V, I could right-click a file and go to Checkout and Open -- this would auto-sync the file, check it out and open it. Now however, I have to Get Latest Version before I have the option to Checkout and Open -- can I change this back to how it was somehow?
Related
I am trying to update the readme.txt file Tested up to: in the tags/1.4.1/ folder, as Otto mentioned here: https://wordpress.org/support/topic/update-plugin-tested-up-to-version-without-triggering-plugin-update-to-users/
without bumping the version
I have successfully updated the trunk/readme.txt file Tested up to: but I am not sure how to update the tags/1.4.1/readme.txt file.
~
I edited the file locally. When I right click on the file in tags/1.4.1/ and select TortoiseSVN > there is no option to 'push' or anything else that would suggest updating that file.
When I right click on the readme.txt file in trunk/ and choose TortoiseSVN > Baranch/tag it gives me an error that the file already exists.
If I right click on the readme.txt file in trunk/ and choose SVN Commit there is no option for the tags folder.
If anyone using TortoiseSVN to update their WordPress Plugin for changing the Tested up to:can provide a step by step that would be appreciated!
You can change your current tag:
Get a working copy that points to tags/1.4.1/. To do this, right click on a directory in windows explorer where you want to place your working copy. Then select SVN Checkout.... Change the 'URL of repository' to tags/1.4.1/. See: Checking Out A Working Copy
Make your local changes in the working copy you created in previous step.
Right click on the folder of your working copy and select SVN Commit... Commit your changes in the working copy you worked on in previous step. TortoiseSVN may warn you that you're trying to commit into a tag (which is true) but you can proceed anyway if that's what you want.
... or you can simply remove the tag from the Repository Browser, make your changes elsewhere (in a working copy that points to trunk) and then Branch/Tag again from the aforementioned working copy.
I just merged a directory and am doing a TortoiseSVN diff to check for changes before committing. I can see from the file explorer that I have modified several files, but I can't see anything from the diff, only the propinfo. It seems I modified svn:mergeinfo while merging, and that is all the diff is showing me.
How do I see the actual files that have changed??? Using Kdiff3 vs TortoiseMerge doesn't make a difference.
TortoiseSVN version 1.9.7
When propinfo is modified, TortoiseSVN apparently only shows this propinfo when diffing a directory, if you use "SVN diff" from the context menu.
You can work around this by using Check for Updates from the context menu rather than SVN diff.
This works because "Check for Updates" appears (?) to be equivalent to the command TortoiseProc.exe /command:diff /path:. /ignoreprops, while "SVN diff" does not pass the ignoreprops flag.
I've set up a new workspace in /Users/sylwester/test and checked for get all revisions and switch to workspace. Every time i start p4v and select my workspace after login I get this error. The command it says it has performed is:
p4 changes -s submitted -l -m 100 /Applications/...
The p4v executable is of course in the /Applications/ directory but my workspace in /Users/sylwester/test. To be sure it was not fixed at a later version i upgraded p4v to 2017.2 (P4V/MACOSX1011X86_64/2017.2/1518788)
It sounds like you have a filter somewhere (probably the history or submitted changelists tab?) that specifies /Applications/... as the path. If you clear or fix that I'd expect the error to go away.
I've added a new file (pdf) to a directory and when I try and commit the new file it is saying that it is not under version control, the directory and every other file in the directory is under version control as when I tried svn add * it listed all the files as being under version control.
What is causing this problem and how do I fix it?
EDIT: OK I am now able to add the file, am I right in saying that the svn add * command added this file under version control thus allowing me to commit the file?
Yes, the svn add * did that.
You have to svn add Name_of_File any new files before you can svn commit them.
you can try something like this...
in the checkout directory run this command
svn add . --force
then just commit it all
svn commit -m "your text" *
In some cases the add command doesn't do it, and still gives an error. the best thing is to perform the svn cleanup [PATH...] command then try to add or commit.
Wanting to use KDiff3 as my conflict resolution tool for TortoiseSVN I followed the instructions here and here to configure TortoiseSVN to use KDiff3. My merge tool settings in TortoiseSVN are thus:
C:\Program Files (x86)\KDiff3\kdiff3.exe %base %mine %theirs -o %merged --L1 %bname --L2 %yname --L3 %tname
When performing a merge a conflicts may be detected. If they are I hit the 'Edit Conflict' button to launch KDiff3 and reconcile the merge conflicts.
However, when I save my merge the result is saved to a temporary file in the .svn folders rather than within the actual working file C:\projects\my-new-project\src\mvags1.mxml. The temporary location can be seen in the KDiff3 output window as well.
Have I configured anything incorrectly or are my expectations for how KDiff3 works with TortoiseSVN incorrect?
I am using TortoiseSVN 1.7.5 and KDiff3 0.9.96.
My expectations for how KDiff3 would work with TortoiseSVN and Subversion were flawed. The behavior that I was experiencing is the correct behavior.
The proper process for using KDiff3 with TortoiseSVN is:
Click the edit conflicts button when conflicts are detected (in TortoiseSVN)
Resolve the merge with KDiff3
Click the save button in KDiff3
Close KDiff3
In TortoiseSVN mark the file as resolved
After merge to working copy of a branch (svn merge --quiet --accept postpone http://../trunk)
I go to TortoiseSVN extension menu and select "Resolve..."
The window with the list of conflicted items displayed.
Right click on the first item and then select "Edit conflicts". KDiff3 merge window appears.
Pressing B for selecting line source.
click Save. File will be saved with merge result.
Close KDiff3.
How to make conflict automatically marked as resolved in TortoiseSVN when I exiting KDiff3?
I am using:
Windows 10 x64
TortoiseSVN 1.9.5, Build 27581 - 64 Bit
kdiff3 Version 0.9.98 (64 bit)
Merge Tool setting in TortoiseSVN
C:\Program Files\KDiff3\kdiff3.exe %base %mine %theirs -o %merged --L1 Base --L2 Mine --L3 Theirs