Re: Sv: List modified on a branch
If you have never merged anything from trunk, you have to do the more cumbersome version with doing "log -v --stop-on-copy" to find the copy source in the last of those revisions. If you know you have merged the trunk at least once, then you have that information in the svn:mergeinfo property so you can e.g. do svn pg svn:mergeinfo $SERVER/project/branch | grep trunk (usually, the trunk is the last entry so "tail -1" will probably work) That will list the merged revision ranges. --- Original Message --- On Monday, February 14th, 2022 at 9:23 AM, Mikael Stålhammar wrote: > Thanks Stefan and Daniel. > Stefans answer looked easy and something I could use. I just need a command > then to get the revision of the latest merged trunk revision. Preferably > without the need to have a working copy, i.e. a command to query the SVN > server directly. What should I use for that? > /Mikael > > --- > > Från: Daniel Shahaf > Skickat: den 11 februari 2022 13:05 > Till: Mikael Stålhammar > Kopia: users@subversion.apache.org > Ämne: Re: List modified on a branch > > Stefan Sperling wrote on Fri, 11 Feb 2022 10:57 +00:00: >> On Fri, Feb 11, 2022 at 08:29:35AM +, Mikael Stålhammar wrote: >>> Is there a simple command that lets you list files that have been modified >>> and committed on a feature branch but excluding any files that are >>> committed on the branch that are only merged from trunk (to keep the branch >>> up-to-date with trunk). I.e. I only want to see those files that actually >>> contain branch specific changes. >> >> Find the most recent revision where a merge from trunk to the branch >> occurred. >> If no such merge has occurred yet, find the revision in which the branch >> was created. >> > > tl;dr: A tools/ script to do this wouldn't go amiss. > > Here's pseudocode for this; it involves one easy but less-than-obvious > command and one parsing task that's encapsulated in our APIs. > > [[[ > svn log -r 0:HEAD --limit=1 --stop-on-copy -q -v ./ | > parse_the_copyfrom_path_and_revision > svn propget --strict svn:mergeinfo ./ | > parse_and_extract_revisions_merged_from $COPYFROM_PATH > if any revisions have been extracted: > return max() of those > else: > return $COPYFROM_REVISION > ]]] > >> Let's assume this was revision r100. >> >> Now you can run: svn diff --summarize ^/trunk@r100 ^/branches/mybranch
Re: SVN PROBLEM
On Thu, 17 Feb 2022 16:34:16 +0300, NICK Margeyt wrote: >Hello,Please help in solving the problem, why the authorization window >for connecting to the repository does not appear, I have already tried >everything possible from reinstalling SVN to updating, anyway, any >user from the network can go to the repository by URL. Attached is the >configuration file and the authorization window that should come out >but it is not there >Thanks. What you have *not* supplied to your question is: - Which version of subversion are you using? - On which platform are you using svn? - How are you accessing the computer? (GUI, Terminal, SSH or how) - What command did you issue? - What was the actual error? - What are your customization(s) of the svn configuration file? - Are you by any chance using TortoiseSVN? etc etc -- Bo Berglund Developer in Sweden
Re: Subversion environmental variables
On Thu, 3 Feb 2022 14:12:14 -0500, Nathan Hartman wrote: >There exists somewhere in our mail archives >a script for zsh (which I can try to find if you want it) to manually >cache a plaintext password, if you feel this is an acceptable >solution. (There might also be a python script; I don't remember.) I am having problems working with svn on several platforms, like RaspberryPi and Ubuntu Mint. From some updated version of subversion passwords are no longer cached by svn itself and hence the operating system pops up a dialog in the GUI to fill in for executing say an svn update. But I mostly work on the command line, very seldom on the GUI so I don't see this When it first appeared I just saw a failing svn command and could not understand why. Now I know what was going on and so I have to VNC to the machines (they are mostly remote from my location) and thereby getting a GUI. Then I do the svn command in PuTTY and when it stalls I go over to the VNC GUI and sure enough: There is the pop-up window to be filled in. Pretty darn dumb decision to remove the password cache from svn if you ask me... Anyway I would be *very interested* in adding such a script for caching an svn password on my machine to get rid of this problem! -- Bo Berglund Developer in Sweden
SVN PROBLEM
Hello,Please help in solving the problem, why the authorization window for connecting to the repository does not appear, I have already tried everything possible from reinstalling SVN to updating, anyway, any user from the network can go to the repository by URL. Attached is the configuration file and the authorization window that should come out but it is not there Thanks.
