how to get a list of unmerged revisions?

2011-06-19 Thread B Smith-Mannschott
I've got a trunk and a maintenance branch. I periodically merge changes from the maintenance branch to trunk. Merge tracking is a help here. Commits on the maintenance branch begin with an ID identifying the issue, backlog item or user story. When I merge changes to trunk, I'd like to merge those

Re: Evil UTF-8 Character in filename in repo causing issues on my wc

2011-06-16 Thread B Smith-Mannschott
On Thu, Jun 16, 2011 at 18:24, Geoff Hoffman wrote: > > > On Wed, Jun 15, 2011 at 11:19 PM, Markus Schaber > wrote: >> >> Hi, Geoff, >> >> Von: Geoff Hoffman [mailto:ghoff...@cardinalpath.com] >> >>> I have a file with some (I believe) Portuguese characters in the >> >>> filename that someone man

Re: where is the missing versions

2011-04-10 Thread B Smith-Mannschott
On Sun, Apr 10, 2011 at 19:28, Gu Shiyuan wrote: > Hi, >    svn log gives me a list of the history, but I notice that some versions > are skipped. In the list, r44 is followed by r49 while r45-r48 is missing. > How can I find out those versions? I remember I made some important comments > when I c

Re: examining repository for files that only I have changed

2011-01-22 Thread B Smith-Mannschott
On Fri, Jan 21, 2011 at 17:18, Woodworth, James wrote: > Hello, > > Over the past three weeks I have changed and committed some files.  I need > to somehow recurse through the directories and show me only the files I have > changed.  How do I do this? > > I suppose I could write a script to do thi

Re: svnadmin: Can't write to stream: File too large

2011-01-03 Thread B Smith-Mannschott
On Mon, Jan 3, 2011 at 14:16, Torsten Krah wrote: > Hi, > > ive got a large repository (using svn version 1.5.1 r32289) and want to dump > the repository. > Dumping with svnadmin dump $repo > dumpfile does result in: > > svnadmin: Can't write to stream: File too large > > The file at this time is

Re: Periodically merge between trunk->branch and branch->trunk

2010-12-10 Thread B Smith-Mannschott
On Thu, Dec 9, 2010 at 20:27, Kris Deugau wrote: > Daniel Albuschat wrote: >> >> I'd like to create a branch from trunk and periodically merge trunk >> into my branch to stay up to date with what happens in trunk. >> At some point, the feature in my branch reaches a kind of stability >> that is OK

Re: 350GB SVN repo creates around 1MB revision for simplest task

2010-10-13 Thread B Smith-Mannschott
On Wed, Oct 13, 2010 at 00:45, FAISAL YAQOOB, BLOOMBERG/ 731 LEXIN wrote: > > > This all started when I noticed that my repository size is increasing at a > daily rate of 1GB. I did a simple test. Created a branch/tag of an existing > folder that had a size of 35KB. I took note of revision numbe

Re: character encoding of file content

2010-08-23 Thread B Smith-Mannschott
On Mon, Aug 23, 2010 at 16:23, Mark Phippard wrote: > On Mon, Aug 23, 2010 at 10:21 AM, Schroeder, Hartmut > wrote: > > > I have a question concerning character encoding of file content. > > > > Let's say, we have two text files containing german umlauts and with > > different file encodings, o

Re: How to tell Subversion what is the encoding of a file?

2010-08-22 Thread B Smith-Mannschott
On Sat, Aug 21, 2010 at 17:33, JWalker wrote: > Hi, > > I use ViewVC for viewing SVN repositories. I have files (C source > files) with comments written in cyrillic (Windows-1251). ViewVC > display these comments as ? characters. I was told in another forum > that I have to tell Subversion what th

Re: problem with SVN filename encoding on MacOSX

2010-08-15 Thread B Smith-Mannschott
On Mon, Aug 16, 2010 at 05:06, Albert Zeyer wrote: > Hi, > > I have some problems with filename encodings under MacOSX. For example, I am > seeing always status messages like this: > > a...@ip212 1057 (Integration) %svn status > ?       Verbesserungsvorschläge_Applets.odt > !       Verbesserungsvo

Re: Repository shrinkage on conversion 1.5 -> 1.6?

2010-07-28 Thread B Smith-Mannschott
On Wed, Jul 28, 2010 at 11:01, John Beranek wrote: > > I maintain a 76000 revision Subversion 1.5 repository that add up to a > 101GiB FSFS db. > > I'm looking to upgrade to 1.6, so did a dump and load cycle. The > resulting dump file was 173GiB (I use --deltas). What surprised me is > that the re

Re: Working copy 'from the future' after restoring server from old backup (was "Huge Problem")

2010-06-06 Thread B Smith-Mannschott
On Sun, Jun 6, 2010 at 21:43, Abius X wrote: > Hi > thanks for the quick response, > Actually I'm on OS X Snow Leopard (10.6.3) and > I'm using Eclipse and Subversive (or Subclipse whichever is bundled with > Eclipse) > > I'm partially familiar with diff, but my project folder is quite huge! > >

Re: Check out problem because of alleged problematic URL

2010-06-06 Thread B Smith-Mannschott
On Sun, Jun 6, 2010 at 15:49, Hirschberg, Benyamin wrote: > Hi > > > > I’m stuck with an annoying problem. > > > > I have an SVN server set up on a LAN server. I’m accessing it with > http://ada-srp/kr/svn/trunk, it is working from browsers and windows svn > clients (both Tortoise and command line

Working copy 'from the future' after restoring server from old backup (was "Huge Problem")

2010-06-06 Thread B Smith-Mannschott
(I'm sending this Cc back to the list, since others may have input too.) On Sun, Jun 6, 2010 at 19:36, Abius X wrote: > Hi > Sorry for brief desscriptions, > Yep there are different error messages that describe server revision is older > than working copy. > > Yes I mean a backup, the server cra

Re: Huge Problem

2010-06-06 Thread B Smith-Mannschott
On Sun, Jun 6, 2010 at 11:31, Abius X wrote: > Hello > I'm unable to commit or update, since i've restored a previous revision of my > subversion repository on the server. > > What should I do? Describe "unable to commit or update" and "restored a previous revision of my subversion repository" m

Re: merge, --reintegrate, --record-only, near infinite regress in --use-merge-history

2010-06-02 Thread B Smith-Mannschott
On Wed, Jun 2, 2010 at 12:46, Stefan Sperling wrote: > On Wed, Jun 02, 2010 at 12:37:13PM +0200, Stefan Sperling wrote: >> We should figure out how log -g should behave in this case (the behaviour >> you're seeing clearly isn't desirable) and then fix it. >> Please file an issue. > > Oh, and if yo

merge, --reintegrate, --record-only, near infinite regress in --use-merge-history

2010-06-02 Thread B Smith-Mannschott
Bah!! (I'm a just a wee bit frustrated as I write this, please forgive any roughness in tone.) After waiting patiently for $JOB to finally move our server to Subversion 1.6, I'm finding Subversion's merge tracking to be rather less help than I'd hoped. (I guess git/hg/bzr have spoiled me during my

Re: svnadmin load to fsfs 9 times faster than bdb!?

2010-05-31 Thread B Smith-Mannschott
On Mon, May 31, 2010 at 02:52, Mark Phippard wrote: > You just need to specify --bdb-txn-nosync when running svnadmin > create. although it is possible that svnadmin load also accepts this > option.  This should make the load times about the same. > > There is something you are supposed to change

svnadmin load to fsfs 9 times faster than bdb!?

2010-05-30 Thread B Smith-Mannschott
I've never really been much of a user of the BDB back end. I started with Subversion in the 1.3 time-frame and have always used FSFS. Nevertheless, I recently was playing around with BDB and found that it takes a *lot* longer to load from a dump file than FSFS. * repository of 41818 revisions * d

Re: compact repository (many files)

2010-05-27 Thread B Smith-Mannschott
On Thu, May 27, 2010 at 16:31, Paul Ebermann wrote: > B Smith-Mannschott wrote: >> On Wed, May 26, 2010 at 19:07, Paul Ebermann wrote: > >>> I think packing the revprops would (from a space viewpoint) be even more >>> useful than >>> packing the revisio

Re: compact repository (many files)

2010-05-26 Thread B Smith-Mannschott
On Wed, May 26, 2010 at 19:07, Paul Ebermann wrote: > Mark Phippard wrote: >> On Wed, May 26, 2010 at 11:53 AM, Paul Ebermann wrote: > [...] >>> Is there any way to reduce the file number of the repository without >>> throwing away >>> information? As in, throw the changes in revisions 0 ... 999

Re: Size of SVN Transaction vs Actual commit size

2010-05-07 Thread B Smith-Mannschott
On Fri, May 7, 2010 at 06:48, Ravi Roy wrote: > > On Thu, May 6, 2010 at 3:37 PM, Ravi Roy wrote: >> >> Hi >> >> General question about Transaction size versus actual file commit size. I >> am getting strange results when I am trying to commit 1.28 file and >> transaction size I am getting is 553

Re: svn+ssh: Expected FS format '2'; found format '4'

2010-04-18 Thread B Smith-Mannschott
On Mon, Apr 19, 2010 at 08:08, B Smith-Mannschott wrote: > On Sat, Apr 17, 2010 at 16:58, Rainer Dorsch wrote: > ... >> I have now root access to the server containing the repository, I cannot use >> keypair authentification. > > This isn't relevant. Bes

Re: svn+ssh: Expected FS format '2'; found format '4'

2010-04-18 Thread B Smith-Mannschott
On Sat, Apr 17, 2010 at 16:58, Rainer Dorsch wrote: > and a more recent version in a non-standard dir (which is added to my path > in .bash_profile) add it to your path in .bashrc instead. .bash_profile only gets loaded by interactive login shells. > I expect that .bash_profile is not executed

need heuristic to order the application of path elements a'la svn log --xml --verbose

2010-03-28 Thread B Smith-Mannschott
svn log --xml --verbose emits elements, each of which contains a number of elements describing the changes made in that revision: ... /trunk/src/com/example/courts/model /trunk/src/com/example /trunk/src/com/example/courts/model/CourtsObject.java ... My difficulty, is that these path entries se

Re: SVN Server Best Practices?

2010-03-03 Thread B Smith-Mannschott
2010/3/3 Mariusz Droździel : > Hello, > > After spending almost 2 days on recovering broken FSFS, which turned > out to be broken for over year already I have a question. What are > suggested best practices for SVN Repo? Some kind of cronbot which > would do a verify and a full checkout dialy comes

Re: SCM, Content-Management and cherry-picking in big project

2010-03-01 Thread B Smith-Mannschott
On Sun, Feb 28, 2010 at 21:33, Pacco wrote: > Hi, > > I'm responsible for the content of a single package within a bigger software > (several million lines of code). I'm experienced with ClearCase, Dimensions, > CVS, git, mercurial, etc. > Now, management decision was made to use Subversion over o

Re: dumpfilter exclude question

2010-02-19 Thread B Smith-Mannschott
On Fri, Feb 19, 2010 at 02:46, Justin Connell wrote: > Hi, > If I use a dumpfilter exclude /parentpath/folder_to_drop will the content of > the parentpath be preserved? parentpath and everything in parentpath (except folder_to_drop and its contents) will be preserved. // Ben

Re: Distributed Subversion Repositories

2010-02-17 Thread B Smith-Mannschott
On Thu, Feb 18, 2010 at 03:59, Vincent Lefevre wrote: > On 2010-02-17 11:18:18 +, Julian Phillips wrote: >> If using a different tool is an option, then there are tools that let you >> interact directly with Subversion repositories from various other SCM >> tools, e.g. >> >> http://mercurial.s

Re: Distributed Subversion Repositories

2010-02-17 Thread B Smith-Mannschott
On Wed, Feb 17, 2010 at 11:08, Mark wrote: > I have the following problem. Repository A is used by a lab of developers. 1 > developer needs to work off site against the code base held in A, for an > extended period of time. He requires version control, but cannot gain access > to Repository A. To

Re: SVN Dump Question

2010-02-16 Thread B Smith-Mannschott
On Tue, Feb 16, 2010 at 18:39, Justin Connell wrote: > The reason, I'm asking such strange questions is that I have a very abnormal > situation on my hands here. I previously took a full dump of the repo (for > the reason you implied) where the original size of the repo on disk was 150 > GB, and