RE: Usability enhancement to merge from combo to exclude current branch.

2014-08-28 Thread Cooke, Mark
Hi Tony, > -Original Message- > From: Tony Rietwyk [mailto:tony.riet...@rightsoft.com.au] > Sent: 29 August 2014 01:52 > > Hi, > > I am using TortoiseSVN version 1.8.8, Build 25755 - 64 Bit, with SVN 1.8.10 > on Windows 7 64bit. > > It is great that Tortoise remembers the last repo sele

Usability enhancement to merge from combo to exclude current branch.

2014-08-28 Thread Tony Rietwyk
Hi, I am using TortoiseSVN version 1.8.8, Build 25755 - 64 Bit, with SVN 1.8.10 on Windows 7 64bit. It is great that Tortoise remembers the last repo selected in the merge from combo. In my use case, I am often moving patches between two major version branches. So I go in and merge from A to

Re: svn merge --ignore-properties

2014-08-28 Thread Dan Ellis
> > > I don't think this is a merge problem as much as a conflict resolution > problem. Perhaps efforts would be a better invested in trying to improve > the property conflict resolution mechanisms of 'svn resolve' to make > your workflow easier? > > It sounds like if you'd be in less trouble if yo

Re: svn merge --ignore-properties

2014-08-28 Thread Dan Ellis
On Thu, Aug 28, 2014 at 2:27 PM, Stefan Sperling wrote: > On Thu, Aug 28, 2014 at 02:03:59PM -0700, Dan Ellis wrote: > > Hi, > > Can anyone talk about the robustness of a diff/patch solution to merging > on > > text contents? > > It would work fine, except for tree changes (though 'svn merge' its

Re: svn merge --ignore-properties

2014-08-28 Thread Garance A Drosehn
On 28 Aug 2014, at 17:03, Dan Ellis wrote: > > > We maintain some vendor-like code on some branches that we periodically > want to merge into our development branch. The problem is that both in > our development branch and in the vendor-like branch, we use subversion > properties for some house ke

Re: svn merge --ignore-properties

2014-08-28 Thread Stefan Sperling
On Thu, Aug 28, 2014 at 02:03:59PM -0700, Dan Ellis wrote: > Hi, > > This has been brought up before but in a different context ( > http://mail-archives.apache.org/mod_mbox/subversion-dev/201311.mbox/%3c20131107155018.gg10...@ted.stsp.name%3E > ) > > We maintain some vendor-like code on some bran

svn merge --ignore-properties

2014-08-28 Thread Dan Ellis
Hi, This has been brought up before but in a different context ( http://mail-archives.apache.org/mod_mbox/subversion-dev/201311.mbox/%3c20131107155018.gg10...@ted.stsp.name%3E ) We maintain some vendor-like code on some branches that we periodically want to merge into our development branch. The

Re: Repository migrated via SVNSYNC is much smaller than one migrated using SVNADMIN DUMP/LOAD

2014-08-28 Thread Les Mikesell
On Thu, Aug 28, 2014 at 11:12 AM, Christopher Lamb wrote: > > 4.4G/svn_repos/repo_loadedby_svnadmin/db/revs > 75M /svn_repos/repo_loadedby_svnsync/db/revs > > > SVN LIST gives results for the repo loaded by SVNADMIN, but nothing for > > those loaded via SVNSYNC. Either you made a typo in

Re: Repository migrated via SVNSYNC is much smaller than one migrated using SVNADMIN DUMP/LOAD

2014-08-28 Thread Andreas Stieger
Hello, On 28/08/14 17:12, Christopher Lamb wrote: > While experimenting how best to do this I have tried using both SVNADMIN > DUMP / LOAD, SVNSYNC, and even SVNRDUMP. The resulting target repos have > dramatically different sizes, hence this mail. > > > Original repo size 5.51 GB > Almost 19,00

Repository migrated via SVNSYNC is much smaller than one migrated using SVNADMIN DUMP/LOAD

2014-08-28 Thread Christopher Lamb
Hi all we are in the process of migrating a SVN repository from Windows to Linux. While experimenting how best to do this I have tried using both SVNADMIN DUMP / LOAD, SVNSYNC, and even SVNRDUMP. The resulting target repos have dramatically different sizes, hence this mail. Original repo size

RE: Blocking root from SVN repository

2014-08-28 Thread Bob Archer
> On Wed, Aug 27, 2014 at 12:58 PM, Bob Archer > wrote: > >> -Original Message- > >> And I hate to repeat myself, but I'll repeat for the third time this > >> question: if file:// is not intended to be used, then what are the > >> available options for those who need a version control syst

Re: Blocking root from SVN repository

2014-08-28 Thread Philip Martin
Stefan Sperling writes: > That said, a one-line pre-commit hook script could check its UID and > disallow the commit if it is invoked as root: > if [ "`whoami`" == "root" ]; then exit 1; fi The start-commit is probably better than the pre-commit as there is no point allowing the transaction to s

Re: Blocking root from SVN repository

2014-08-28 Thread Nico Kadel-Garcia
On Thu, Aug 28, 2014 at 4:28 AM, Zé wrote: > On 08/27/2014 05:58 PM, Bob Archer wrote: >>> >>> -Original Message- And I hate to repeat myself, but I'll >>> repeat for the third time this question: if file:// is not intended >>> to be used, then what are the available options for those who

Re: Blocking root from SVN repository

2014-08-28 Thread
On 08/27/2014 05:58 PM, Bob Archer wrote: -Original Message- And I hate to repeat myself, but I'll repeat for the third time this question: if file:// is not intended to be used, then what are the available options for those who need a version control system and can't set up a server? Zé

Re: Blocking root from SVN repository

2014-08-28 Thread
On 08/27/2014 05:09 PM, jbl...@icloud.com wrote: On Aug 27, 2014, at 8:28 AM, Zé wrote: Additionally, to those security-concious people, installing servers on your workstation just to access local repositories isn't exactly on the top of best practices. Don't you agree? Not at all. Runni