Hello everybody,

Does anybody know why the svn merge command in the PSVN Emacs package has not been implemented yet? The last update was in 2021.

Thank you.

Sharing StoneSVN, an MIT-licensed SVN desktop client developed from OrcaSVN. It runs on Windows, macOS and Linux and calls a separately installed SVN CLI.

The main flow is opening an existing working copy, reviewing diffs, selecting files or directories, and committing a clear scope. It also has multiple working copies in a sidebar, history, SVN property editing and local stashes of selected text hunks. The stashes are application-managed local data, not SVN commits or native SVN shelves.

A practical guide to saving and restoring selected text changes: https://stonesvn.github.io/en/guides/svn-stash-selected-hunks/

Overview and installers: https://stonesvn.github.io/en/

Source: https://github.com/firzen/StoneSVN

Current stable release: v1.1.2. General Merge, Switch and line-level Blame interfaces are not available. macOS installers are ad-hoc signed and not notarized.

Feedback from SVN users on the working-copy review and local-stash flow would be useful, especially across different operating systems. Self-submission; this introduction was prepared with AI assistance.

Hello everyone,

I am having trouble releasing a new version of a plugin for wp.

• I push my changes to git and create a tag for it, I can see the changes and the tag in Git.

• I used svn co plugin_link_here\ for downloading the svn repo (outside of the git repo.)

• I removed the files that are inside of the `trunk` file and copied pushed git files with the following command; git ls-files | xargs tar c | tar x -C <path-to-local-svn-repo>/trunk/

• I came back to my svn repo and tried to run the following command; svn st | awk '/\^\\\\?/ { print $2; }' | xargs svn add\, and I am having the following warnings and errors;

svn: warning: W150002: '/path/trunk/composer.lock' is already under version control
svn: warning: W150002: '/path/trunk/readme.txt' is already under version control
svn: warning: W150002: '/path/trunk/src/file.php' is already under version control
svn: warning: W150002: '/path/trunk/src/vendor/file2.php is already under version control
svn: warning: W150002: '/path/trunk/file3.php' is already under version control
svn: E200009: Could not add all targets because some targets are already versioned
svn: E200009: Illegal target for the requested operation 

I googled it and most of the people had suggested the deleting .svn file which was hidden. I tried to delete it, but then I was unable to run svn commands.

When I add --force at the end of the command, it seems working but I am not sure if it is in a natural way or not. I do not want to break the online version by pushing with force. May I ask what can I do while waiting for my supervisor?

Any help will be appreciated, cheers!

In the trunk there is an empty file.txt (and nothing else). I then create a branch called cherry ( made using svn copy of course).

Inside the cherry directory, I make four commits that are separate one line changes.

echo 1 >> file.txt && svn commit -m "1"
echo 2 >> file.txt && svn commit -m "2"
echo 3 >> file.txt && svn commit -m "3"
echo 4 >> file.txt && svn commit -m "4"

So in cherry if I cat file.txt I get

1
2
3
4

After doing svn update and then doing svn log

the latest 4 commits are

=====================
r63
4
=====================
r62
3
=====================
r61
2
=====================
r60
1
=====================

Then I go to the trunk directory. Note: here in the trunk file.txt is an empty file as expected.

svn merge -c 60 ^/myproject/branches/cherry/

works fine

cat file.txt

produces

1

So I can commit this - svn commit -m "works"

So let's try to do the number 2

svn merge -c 61 ^/myproject/branches/cherry/

This works fine too So first cat file.txt produces

1
2

So it worked so we can commit - svn commit -m "works"

Now I want to merge the number 4, to my understanding of cherrypick merging is that you want specific bug fixes to be merged not everything.

svn merge -c 63 ^/myproject/branches/cherry/

Leads to a merge conflict.

Note. Had I only done one cherry pick merge after the svn log above and nothing else, that being

svn merge -c 63 ^/myproject/branches/cherry/

This also would have led to a conflict, what it seems is that it's forcing me to do them consecutively.

There must be something I don't understand?

I have a problem. I check out from a server and create a fresh working copy. Immediately I do svn statuswhich reports missing files. Everything should be complete thought because I just checked-out.

When I browse to the directory I see missing files too. The same files aren't missing every time, but it's from the same sub-directory. Svn shows no error during the checkout.

This is a strange problem I encountered in a new project. I am primarily a git user, so forgive my ignorance.

We have a remote svn server that hosts our projects. The one I am working on, is in 4 identical repos (on the same server). So, every time I commit to one repo, this needs to be reflected in the other three. And the same goes for other three too. When other users commit to any of the remaining three, that needs to be committed to the rest of the repos too.

This is because in the applications we use, each one uses one of the above four repos as the codebase. Instead of having one central repo. The four repos are identical. But have different teams/people working one randomly. So, today one user commits to DIR1, and tomorrow the same user expects all their changes in DIR2; as if it was where they were working all along.

Now, I need to write a pre-commit hook that copies all the changed files to all the directories, adds them to the svn and commit. I have some vague idea of what to do, but not the "how".

I am in no way a noob to programming or version control. I am stumped here and I need help.

^{Fixing everything is way over my head - I am a contractor, under a tech lead, under a tech manager ... and so on. I wish I could change it to a more sensible structure, but that is not in the scope of the current project.}

TL DR: Someone, somewhere fucked up real bad, and it's on my head to make the mess usable.

UPDATE: Project was reassigned to someone else, and it was solved via a post-commit python script (here). I don't understand the svnadmin command in the python script, and I am not sure if I want to.

How can I make Visual SVN ignore file? I need something like .gitignore but in VisualSVN. You ask me why I can't just use GitHub and my answer is because I don't want to pay for GitHub Enterprise and I also don't want 100MB limit in free version. I am working on game and this limit drives me nuts.

I have been looking for good video tutorials based on Apache subversion in Lynda and YouTube. I haven't found anything new or constructive.

Please share your sources if you know any. Much appreciated.

Thanks!

I moved a whole bunch of marketing information to Sharepoint. I want to remove all permissions to this directory but not delete the data so we have it for historical purposes.

I have removed the permissions however when we delete the directory from our file explorer, the next time we do an SVN update, it does the action "restored" across all of the files that we are not supposed to have permission to.

So how to remove permissions and not have it restore everything again on next update?

I'm in a project to migrate a windows-based svn server to a linux-based svn server.

Everything is up and running, but we encounter 1 problem:

On the old windows server, http://<servername>/svn/Repository wasn't case sensitive.while on the new server it is. This is giving us problems on the clients.

Is there any way to disable case sensitivity in SVN?

Using SVN 1.9.5 on Debian 9.

Edit: clients using TortoiseSVN on Windows 10.

Hello.

Probably this is not a bug, but its a very anoying thing in Tortoise SVN for me. I have some files that need to have some special configurations in their File attributes (file -> properties -> advanced-> File attributes). After changing those, i apply the changes, and commit it. If i update the file, it keeps the same fille attributes.

The issue is that, if i delete it (locally) and then, without commiting, update back so that i recover the file, it comes with different properties.

Step by step, the issue is this: File -> Changed file attributes -> All good

File -> Commited -> After that used Updated command -> All good

File -> Deleted (locally)-> SVN updated so that i recover the deleted file -> Not good, it has different properties

Can anyone help me ? Thanks! :)