SlikSVN no longer active?

2019-04-12 Thread Daniel Becroft
.html#windows Thanks. --- Daniel Becroft

Re: svn vs. git

2017-07-20 Thread Daniel Becroft
We did a similar comparison as well, and again stuck with SVN. However, this was predominantly due to the challenge of getting devs to relearn a whole new process (we had enough trouble migrating from lock-modify-unlock to a checkout/modify/commit workflow). We did like the off-line process, and t

svn log - combining 'search' and 'limit'

2017-06-28 Thread Daniel Becroft
Hi, I've come across something which seems to be working not as expected, but I'm not sure it is a bug. At the moment, I can do `svn log --search "Foo"` to get all the log messages containing "Foo", and `svn log --limit 10` to get the last 10 log messages. I expected that if I combined these (for

Relative URLs on command line

2017-03-20 Thread Daniel Becroft
Hi, I'm trying to use the relative URL syntax from the command line, as mentioned in a 2009 blog post[1]. However, I'm having troubles getting it to work. >From inside a working copy for /branches/release: > svn switch ^/trunk svn: E125002: '/trunk' does not appear to be a URL > svn merge -c 1000

Re: 1.9 - Can't resolve to 'mine full' option for binary file conflict

2015-09-14 Thread Daniel Becroft
resolve to 'mine full' option for binary file > conflict > > > > On 9/14/2015 7:56 AM, Daniel Becroft wrote: > > > Hi guys, > > > > > > > > > I've just upgraded to SVN 1.9. One of the first things I noticed is > > > that whe

1.9 - Can't resolve to 'mine full' option for binary file conflict

2015-09-13 Thread Daniel Becroft
Hi guys, I've just upgraded to SVN 1.9. One of the first things I noticed is that when a binary file conflict is raised during an SVN update, I can no longer use the 'mine-full' option to resolve. The only options I have are: (r) working and (tf) theirs-full. I can't use the 'r' (working) optio

Re: Feature request: Save the old file when svn revert

2015-07-23 Thread Daniel Becroft
On Thu, Jul 23, 2015 at 7:16 PM Grierson, David wrote: > > -Original Message- > > From: Branko Čibej [mailto:br...@wandisco.com] > > Sent: 23 July 2015 07:59 > > To: users@subversion.apache.org > > Subject: Re: Feature request: Save the old file when svn revert > > > > On 22.07.2015 15:51

Re: fsfs storage

2015-05-11 Thread Daniel Becroft
On Mon, May 11, 2015 at 10:56 AM NS Klanten wrote: > Hello all, > > Where are the "initial" or base text files (source codes) are stored in > fsfs storage ? > > I commit a new source code to my svn server, however after searching all > the related svn folders in my server, I can not find the pl

Re: svn status & external definitions

2014-12-16 Thread Daniel Becroft
On Mon, Dec 8, 2014 at 5:07 AM, Branko Čibej wrote: > On 06.12.2014 14:59, Bert Huijben wrote: > > > >> -Original Message- > >> From: Daniel Shahaf [mailto:d...@daniel.shahaf.name] > >> Sent: zaterdag 6 december 2014 12:28 > >> To: Daniel Becr

svn status & external definitions

2014-12-01 Thread Daniel Becroft
ot change the output - the external folders continue to be listed. The help text for this switch just says '--ignore-externals : ignore externals definitions'. Is this intended behaviour? If so, is what scenario will this switch do something? Using: svn 1.8.8 --- Daniel Becroft

Tree conflict resolution options on command-line

2014-08-03 Thread Daniel Becroft
nflict can only be resolved to 'working' state; 'foo\A\B\c.p' not resolved. My question is: If a tree conflict can only ever be resolved to 'working', then (a) why isn't 'working' an option in the resolution prompt?; and (b) why am I being asked to choose something that isn't applicable anyway? --- Daniel Becroft

Merged revisions missing when using 'svn log -g'

2014-07-06 Thread Daniel Becroft
Hi, svn 1.8.8 (r1568071) I've found an interesting scenario where merged revisions are not appearing in the output of an 'svn log -g' command. The revision is included in the svn:mergeinfo changes for the merged revision, but does not appear in the log output. The file changes are in that commit

Re: svn checkout --set-depth ignores externals

2014-07-02 Thread Daniel Becroft
On Thu, Jul 3, 2014 at 4:01 PM, Daniel Becroft wrote: > Hi, > > In the root of our trunk, we have a 'build_tools' folder which is defined > as an external. > > For example > /trunk > /build_tools (external) > /alpha > /A

svn checkout --set-depth ignores externals

2014-07-02 Thread Daniel Becroft
x27;, this folder is ignored, but I continue to get alpha/beta/gamma folders (empty). I can't seem to get it back without checking out the entirety of trunk. Any ideas? Is this intended behaviour? --- Daniel Becroft

svn merge --record-only reports extraneous paths

2013-03-26 Thread Daniel Becroft
that are report actually do have their own 'svn:mergeinfo' properties, but they don't get changes by the merge command (which I expected). I think the paths either need to be updated, or not displays. Using: svn 1.7.7 --- Daniel Becroft

SVN 1.7 repository + Jenkins

2011-12-06 Thread Daniel Becroft
the repositories from both servers. We've also noticed some similar messages appearing with Subclipse, but these appear to be sporadic. Any ideas? --- Daniel Becroft

SVN, VMware and veeam replication

2011-11-17 Thread Daniel Becroft
at we need to be aware of? Is there any particular settings that we need to switch on/off for either the vCemtre or Veeam? Cheers, --- Daniel Becroft

Re: Cherry-picking revision to merge.

2011-10-30 Thread Daniel Becroft
On Mon, Oct 31, 2011 at 10:18 AM, Gavin "Beau" Baumanis < gavin.bauma...@palcare.com.au> wrote: > Hi Everyone, > > I hoping that I can get some help with the theory of cherry-picking merges > to a branch. > > I have the "default" subversion layout; > /trunk > /branches > /tags > > I have a "releas

Re: Getting error when trying to upgrade to version 1.7

2011-10-17 Thread Daniel Becroft
On Tue, Oct 18, 2011 at 1:14 AM, Paul wrote: > I upgraded TortoiseSVN to version 1.7 (I'm on Windows 7 x64) and it said > that I needed to upgrade the format of my files. I told it to go ahead but > it errored out. > > I rebooted, did a Cleanup first and then ran it again. Same error: > >

Re: copy tag shows repo revision, not tag revision - why?

2011-09-11 Thread Daniel Becroft
On Sun, Sep 11, 2011 at 6:09 AM, sebb wrote: > When copying a tag (URL -> URL), the log message shows the repo > revision at the time of the copy, rather than the last commit revision > of the tag. > > This occurs if no revision is specified, or if the revision is > specified as HEAD. > This is

Re: svn update by version not updating correctly

2011-06-01 Thread Daniel Becroft
On Thu, Jun 2, 2011 at 8:51 AM, Norman Morse wrote: > I have a subversion repository with these log entries: > > & svn log --verbose -r 2431:2433 > > r2431 | cchan | 2007-08-25 08:11:43 -0700 (Sat, 25 Aug 2007) | 1 line > Ch

Re: RFE: Add Subversion keyword for year

2011-04-18 Thread Daniel Becroft
On Tue, Apr 19, 2011 at 7:29 AM, Alex Vincent wrote: > I'm currently in the process of updating copyright notices where I work. > To me, this is an ideal place for a SVN keyword: > > Copyright 2008-$Year$ MyCompany > > The SVN keywords listed in the online documentation list Date, but it's far >

Re: baffled by how merging works

2011-03-23 Thread Daniel Becroft
On Thu, Mar 24, 2011 at 12:03 PM, Michael Remijan wrote: > I'm fairly new to svn and I'm trying to get my head around how svn handles > branches and merging. I've done a lot of reading on this, I've been able to > work my way through merging changes from TRUNK to a BRANCH but I still do > not qui

Re: pre-lock.bat Failed in Repo browser

2011-03-14 Thread Daniel Becroft
On Tue, Mar 15, 2011 at 8:25 AM, Michael Diers wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > On 2011-03-10 11:21, Michael Diers wrote: > > On 2011-03-10 08:23, Waseem Bokhari wrote: > >> This script works fine in all scenarios except Anyone can Steal Lock > when Unlock. > > > >>> U

Re: Using SVN with cron?

2011-03-06 Thread Daniel Becroft
On Mon, Mar 7, 2011 at 5:35 AM, bimininavels wrote: > I've been struggling all morning with what should be a very simple problem. > > I would like to commit and update a svn repository daily using cron. I've > encapsulated my svn calls into a perl script, which runs the following > > > #!/us

Re: Subverion 1.7 Centralized Metadata Storage

2011-02-23 Thread Daniel Becroft
On Thu, Feb 24, 2011 at 12:16 PM, Nguyen Vu Hung (VNC) < vuh...@vinicorp.com.vn> wrote: > (2011/02/22 17:18), Ulrich Eckhardt wrote: > > On Tuesday 22 February 2011, Nguyen Vu Hung (VNC) wrote: > > > * This way makes svn git-like :), my first impression is that: >subversion will be distribut

Re: Property change log

2011-02-15 Thread Daniel Becroft
On Tue, Feb 15, 2011 at 5:03 PM, Daniel Widenfalk wrote: > Hi, > > A colleague of mine asked me this: "Is there an easy > way to list in which revisions a property has changed?". > After wringing my brain around the problem for a bit I > had to conceit failure. My question to the community > is th

Re: how to switch a WC back?

2011-02-13 Thread Daniel Becroft
On Mon, Feb 14, 2011 at 9:15 AM, Paul Maier wrote: > Hi, > > a question about how to switch back a WC: > > I checked out a WC, and then switched some subdirectories to some other > directories. I worked with that for a while, checked in, all fine. > Now I want to switch my WC back. > > Can I auto

Re: Dangerous to keep re-integrated branches alive?

2011-02-11 Thread Daniel Becroft
On Sat, Feb 12, 2011 at 1:10 PM, Varnau, Steve (Neoview) < steve.var...@hp.com> wrote: > Hi all, > > My development group uses quite a bit of branching. I’m trying to train > folks to delete a task branch once it is integrated and create a new one for > the next task. Of course the svnbook gives

Re: Trival merge of big text file: Dismal performance, 540x faster if binary.

2011-01-21 Thread Daniel Becroft
On Fri, Jan 21, 2011 at 7:19 PM, Johan Corveleyn wrote: > On Mon, Jan 17, 2011 at 5:30 PM, krueger, Andreas (Andreas Krüger, > DV-RATIO) wrote: > > Hello, Daniel and all, > > > >> In other words, merging changes from file.c@BRANCH to trunk should > >> detect that file@trunk and file@BRANCH@BRANC

Re: Compiling subversion on Ubuntu 10.10

2011-01-16 Thread Daniel Becroft
On Mon, Jan 17, 2011 at 7:22 AM, Daniel Shahaf wrote: > Daniel Becroft wrote on Sat, Jan 15, 2011 at 08:45:31 +1000: > > After investigation, it seems that the path for LIBTOOL was defined > > incorrectly. I had to change apr-util/build/rules.mk:38 from: > > &g

Re: Compiling subversion on Ubuntu 10.10

2011-01-14 Thread Daniel Becroft
Apologies, I also had to make the same change to apr/build/apr_rules.mk:38. --- Daniel Becroft On Sat, Jan 15, 2011 at 8:45 AM, Daniel Becroft wrote: > Hi, > > I've had some issues compiling Subversion and APR in my Ubuntu environment > (the below output is done from /trunk -

Compiling subversion on Ubuntu 10.10

2011-01-14 Thread Daniel Becroft
ules.mk:38 from: LIBTOOL=$(SHELL) $(top_builddir)/libtool to LIBTOOL=$(SHELL) $(apr_builddir)/libtool I'm unfamiliar with how the configure scripts work, so I'm not sure if this is a problem with the SVN scripts, APR scripts, or my system itself. If it's one of the first two, then I'll report it to the appropriate list. Can anyone provide any guidance? --- Daniel Becroft

Re: SVN Subversion- object level checkout

2011-01-12 Thread Daniel Becroft
On Thu, Jan 13, 2011 at 5:24 PM, wrote: > Hello Micheal, > > Thanks for your mail. > > We are using Tortoise SVN-1.6.7 alongwith Power Builder 11.5. > > We want to lock (check-out) the core power builder object from SVN so > that only one user can modify the object for that time. For this case, >

Re: SVN Hooks to require log message, limit size and file type

2011-01-11 Thread Daniel Becroft
On Wed, Jan 12, 2011 at 11:46 AM, David Xie wrote: > Hello, > > I am looking for a hook to require log message when commit. I succeded to > do it. > > At the same time, I want to limit size less than 10MB and forbid .zip .7z > .rar file type. > I found some hooks from internet, tried multi times

Re: svnadmin create and not being method agnostic

2011-01-04 Thread Daniel Becroft
On Wed, Jan 5, 2011 at 12:31 PM, Nico Kadel-Garcia wrote: > On Tue, Jan 4, 2011 at 4:56 PM, Daniel Becroft > wrote: > > > svnadmin create .\repository > > svnserve -r . > > > > and a repository is created and served via svnserve. With the above > > defaul

Re: svnadmin create and not being method agnostic

2011-01-04 Thread Daniel Becroft
On Wed, Jan 5, 2011 at 5:35 AM, Stefan Sperling wrote: > On Mon, Jan 03, 2011 at 02:35:08PM +0100, Stefan Sperling wrote: > > On Sat, Jan 01, 2011 at 11:58:09PM -0700, Philip Prindeville wrote: > > > I don't care how you do that. As long as it's easily > > > understandable, preferably to both e

Re: svn log -g --xml doesn't include "Merged via" info

2010-12-05 Thread Daniel Becroft
On Mon, Dec 6, 2010 at 6:52 AM, Stanimir Stamenkov wrote: > Issuing 'svn log -g -q' I get an output like: > > > r8 | ... > > r7 | ... > Merged via: r8 >

Re: external file

2010-12-03 Thread Daniel Becroft
On Sat, Dec 4, 2010 at 10:35 AM, Scott Yan wrote: > Hi, djcbecroft: > > Thanks very much for your reply , but I'm afraid that branches can't meet > my request. Because when we make some change to any projects, we want the > changes reflect to all other projects just as external does, but when

Re: external file

2010-12-02 Thread Daniel Becroft
On 02/12/2010, at 20:30, Scott Yan wrote: > Hi, > > At first, thanks for your great works, but our company really need > inter-repository file-externals feature which is not supported now, so , is > there any plan to do this? > > Below is our situation: > There are a dozen sub-facto

Re: AW: How to find out the rev number where a file was deleted?

2010-11-28 Thread Daniel Becroft
On Sun, Nov 28, 2010 at 7:59 AM, Andrey Repin wrote: > Greetings, Les Mikesell! > > >> thanks for having responded. > >> Can I file a feature request for that in the issue tracker, > >> what do you think? > >> > >> @Ryan: Of course with a peg rev I can log that single rev. But the > >> rev number

Re: URL-only renames adds svn:mergeinfo property

2010-11-23 Thread Daniel Becroft
On Wed, Nov 24, 2010 at 6:31 AM, Paul Burba wrote: > On Fri, Nov 19, 2010 at 12:25 PM, Stefan Sperling wrote: > > Hi All, > > The short story, the following behaviors are intentional: > > A) WC-to-WC [copies | moves]: Destination only gets explicit mergeinfo > if the source has it. > > B) URL-to

Re: URL-only renames adds svn:mergeinfo property

2010-11-18 Thread Daniel Becroft
On Tue, Nov 16, 2010 at 3:54 PM, Daniel Becroft wrote: > Hi, > > I've just found (another) issue with using URL-only renames. If one of the > parent directories has svn:mergeinfo recorded on it, then renaming a file > via a URL results in the new file containing a full cop

URL-only renames adds svn:mergeinfo property

2010-11-15 Thread Daniel Becroft
Notice that the 'svn propget' on alpha.txt indicates that there is no svn:mergeinfo property available, but it gets added to beta.txt during the rename. Is this intended behavior? Daniel Becroft

Re: Merging case-only renames to branch

2010-11-15 Thread Daniel Becroft
On Mon, Nov 15, 2010 at 11:44 PM, David Weintraub wrote: > On Sun, Nov 14, 2010 at 7:12 PM, Daniel Becroft > wrote: > > Hi, > > > > We've recently had to rename a couple of files on trunk by case only > (e.g. > > FOO.C to foo.c), which we did via a UR

Merging case-only renames to branch

2010-11-14 Thread Daniel Becroft
ndpit\workingcopy\branchA\A\alpha.txt' svn: File 'D:\temp\svn_sandpit\workingcopy\branchA\A\alpha.txt' has no text base Different wording, but same problem. --- Daniel Becroft

Re: Sparse checkouts automation

2010-11-10 Thread Daniel Becroft
On Thu, Nov 11, 2010 at 9:10 AM, San Martino wrote: > Hello, > > Suppose you have a layout like this: > /trunk >/dir1 > /dir1_1 > file1.txt > file2.txt > /dir1_2 > > Is there a way with one command to sparse-checkout al the elements > of the path to file1.txt (in

Re: SVN Usage - working on both tag and trunk

2010-11-10 Thread Daniel Becroft
On Thu, Nov 11, 2010 at 4:26 AM, Jonathan dos Santos < jonat...@prioriti.com.br> wrote: > Hello, first of all if I’m infringing any rule on the mailing list I’m > really sorry. I’ve tryied searching but couldn’t find a good phrase to > describe my problem. > > > > I’m pretty new to svn and versio

Re: Not so incoherent commit

2010-10-28 Thread Daniel Becroft
On Thu, Oct 28, 2010 at 7:20 PM, Antonio Ávila wrote: > > Hello all, my name is Antonio Ávila and I'm an svn admin/user. I would like > to share what happens to me yesterday with a not so incoherent tag > operation. > > >1. A team member commits changes in the trunk, at time t. (ending up >

Re: Proper way to copy files between a branch and trunk

2010-10-21 Thread Daniel Becroft
On Fri, Oct 22, 2010 at 5:08 AM, Mark _ wrote: > Hi all, > > I have never understood the proper way to transfer files (or directories) > between a branch and trunk and vice versa. > > Originally I thought the svn copy command was the best command to use, but > then someone on this forum informed

Re: Better way to get the full rule of the last commit?

2010-10-10 Thread Daniel Becroft
--- Daniel Becroft On Mon, Oct 11, 2010 at 12:34 PM, Tech Geek wrote: > All my repositories live under /var/lib/svn/. > > Let's the output of the following command (on the SVN server): > # svn changed /var/lib/svn/projectA/ > is > A PartA/tags/DEV-1.00_RC5/ > >

Re: Subversion 1.6.13 Released

2010-10-02 Thread Daniel Becroft
On Sat, Oct 2, 2010 at 10:36 PM, Sjoerd Kivits < sjo...@separator-spareparts.de> wrote: > > Hi, > > Is it possible to download windows binaries for subversion server > somewhere? > I could only find packages including apache and so on... > > Brg, > > Sjoerd > I get mine from SlikSVN (http://www.sl

Re: SVN branching and merging

2010-09-29 Thread Daniel Becroft
On Thu, Sep 30, 2010 at 6:14 AM, Nigel Benns wrote: > I have a question about SVN merge. > I would like to know if it is possible to do this with merging. > > I would like a "trunk" to hold config files for an application. > Then I would like 3 branches, dev, test and uat. > > I want the trunk br

Re: Wrong value in db/format when creating from TortoiseSVN

2010-09-27 Thread Daniel Becroft
On Tue, Sep 28, 2010 at 10:49 AM, Tech Geek wrote: > >I don't know what the repository version numbers are that correspond to > each svn/TSVN version (and you didn't mention which >versions you have > installed). > Linux SVN Server version 1.5.1 (r32289) > TSVN - 1.6.10 (32-bit) > That looks lik

Re: Wrong value in db/format when creating from TortoiseSVN

2010-09-27 Thread Daniel Becroft
On Tue, Sep 28, 2010 at 5:23 AM, Tech Geek wrote: > I have the subversion server running on a Debian Linux machine. The > repositories are residing on a Windows domain shared network drive on the > network which is mapped on the Linux machine as: > mount -t cifs //software/svn_repositories /var/

Re: Transaction and revision numbers

2010-09-06 Thread Daniel Becroft
No 3475006 VAT Reg No 710 3140 03 > > ____________ > > > >From: Daniel Becroft [mailto:djcbecr...@gmail.com] >Sent: 06 September 2010 10:52 >To: Giulio Troccoli >Cc: users@subversion.apache.org >Subject: Re: Transaction and revision numbers > > >

Re: Transaction and revision numbers

2010-09-06 Thread Daniel Becroft
On Mon, Sep 6, 2010 at 7:29 PM, Giulio Troccoli < giulio.trocc...@uk.linedata.com> wrote: > Is there a special format of a transaction number? > > I would like to write a method in perl that gets a number, either > transaction or revision, and then adds the correct --revision or > --transaction pa

Re: Reverse merge - Halted due to an unexpected erro

2010-08-31 Thread Daniel Becroft
On Tue, Aug 31, 2010 at 8:43 PM, Bert Huijben wrote: > > > > -Original Message- > > From: Stefan Sperling [mailto:s...@elego.de] > > Sent: dinsdag 31 augustus 2010 12:22 > > To: Daniel Becroft > > Cc: subversion > > Subject: Re: Reverse merge - H

Re: Why is --reintegrate neccessary?

2010-06-29 Thread Daniel Becroft
On Tue, Jun 29, 2010 at 6:56 PM, Tino Schwarze wrote: > Hi Olivier, > > On Tue, Jun 29, 2010 at 10:18:31AM +0200, Olivier Sannier wrote: > >>> I've had a discussion with a collegue yesterday and he wondered why >>> --reintegrate is neccessary for reintegration merges at all. He supposed >>> SVN sh

'svn switch' and already switched dirs

2010-06-27 Thread Daniel Becroft
e a switch to prevent this from occurring? And, yes, I know that externals could be used for this as well, and if we can't work around the above issue, then we might need to go to that. Cheers, --- Daniel Becroft

Re: .svn-revert files under .svn/prop-base directory ...

2010-06-24 Thread Daniel Becroft
On Fri, Jun 25, 2010 at 4:42 AM, wrote: > Thanks so much for your quick response. > > I'm not sure I understand what you're saying. :-(  When would a > file.svn-revert file be created for the "file" example below?  On a merge?  A > regular commit following modifications?  Does anything in the l

Re: How to find who commits the build and revision number?

2010-06-24 Thread Daniel Becroft
On Thu, Jun 24, 2010 at 1:36 PM, David Weintraub wrote: > On each and every Hudson build webpage is the Subversion repository > revision number. You can use that and "svn log" to see who did the > commit that triggered that build. Hudson also grabs the log information for the revisions on each up

Re: Why am I getting a bad merge?

2010-06-19 Thread Daniel Becroft
On Sun, Jun 20, 2010 at 2:24 AM, Steven Boswell II wrote: > (I asked this question almost a month ago on the users list, but got no > response, so now I'm trying the developers list.) Developers list is not an escalation point of the users@ list. Moving back to the users@ list now ... > I recen

Re: Applying multiple commits done to a branch to another branch

2010-06-16 Thread Daniel Becroft
On Thu, Jun 17, 2010 at 4:20 AM, Bob Archer wrote: > >> You're describing a normal usage of merging. >> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html >> >> You don't want to redo all those commit messages, you want the merge >> to be aware of the history behind everything that's been

Re: can I use svn:externals instead of svn copy to create a tag?

2010-06-10 Thread Daniel Becroft
On Fri, Jun 11, 2010 at 6:42 AM, Gary Hallmark wrote: > All examples I have seen for tagging use svn copy (or svncopy -tag) to > create a tag. If I want to make sure nobody can change the tag, I guess I > could write a commit hook. But couldn't I use a versioned external > definition to create the

Re: Wanted: pre-commit hook to prevent commits to externals definition

2010-06-07 Thread Daniel Becroft
On Mon, Jun 7, 2010 at 6:52 PM, Lorenz wrote: > David Aldrich wrote: >>Please can anyone point me to an example of a svn pre-commit hook that >>prevents commits >>to files that are members of an externals definition? >> >>We want to allow such files to be committed only from within the external

Re: Wanted: pre-commit hook to prevent commits to externals definition

2010-06-03 Thread Daniel Becroft
On Fri, Jun 4, 2010 at 12:12 AM, David Aldrich wrote: > Hi > > Please can anyone point me to an example of a svn pre-commit hook that > prevents commits to files that are members of an externals definition? > > We want to allow such files to be committed only from within the external > directory,

Reintegrate w/ previous --record-only merges

2010-05-28 Thread Daniel Becroft
, can changes be cherry-picked *for exclusion* from a reintegrate merge? Or does reintegrate ignore the mergeinfo? Cheers, --- Daniel Becroft

Re: Strange status if .svn folder removed

2010-05-26 Thread Daniel Becroft
On Thu, May 27, 2010 at 7:06 AM, Steve Armstrong wrote: > Hello all, > > I'm seeing strange behaviour on a Win7_64 machine running the 1.6.9 > command-line binaries. > > I have a working copy checked out (C:\wc). Inside it, there's an empty > folder that's source-controlled (C:\wc\logs). If I dele

Re: Automatic commission?

2010-05-24 Thread Daniel Becroft
On Tue, May 25, 2010 at 7:40 AM, Peng Yu wrote: > It seems that I have to specify which file or files to commit. This > will be a problem if I always simultaneously edit tens of files before > I can do a commission. Is there an automatic way to figure out which > files should be commit and commit

Re: How to change default svn-commit.tmp contents

2010-05-19 Thread Daniel Becroft
command-line. As I understand it, the revisions specified in the diff output (ie on the '---' and '+++' lines) should be the revision currently checked out (ie reported by the 'svn update'). I've never seen (revision HEAD) specified in the diff output, since HEAD i

Re: How to change default svn-commit.tmp contents

2010-05-19 Thread Daniel Becroft
On Thu, May 20, 2010 at 10:08 AM, Bostjan Skufca wrote: > Hi all! > > I would like to change default contents of commit message from 'svn status' > output to add 'svn diff' output. How can this be achieved? > > I have already tried setting editor-cmd in ~/.subversion/config to "svn diff >>> svn-co

Re: Size of SVN Transaction vs Actual commit size

2010-05-07 Thread Daniel Becroft
On Fri, May 7, 2010 at 8:26 PM, Ravi Roy wrote: > > > On Fri, May 7, 2010 at 3:33 PM, Olivier Sannier wrote: >> >> Ravi Roy wrote: >>> >>> Actual commit size is 1.28 MB and this script gives me 5528 bytes. >>>  Something wrong with script or there is compression involved or what ? >> >> Well, rea

Re: Cherry-picking merges

2010-04-30 Thread Daniel Becroft
On Fri, Apr 30, 2010 at 10:52 PM, Greg Troxel wrote: > > Daniel Becroft writes: > > > On Thu, Apr 29, 2010 at 6:45 PM, Joël Conraud > wrote: > > > >> Like yourself, I initially though that it would be able to deal with > this, > >>> but it do

Re: Cherry-picking merges

2010-04-29 Thread Daniel Becroft
On Thu, Apr 29, 2010 at 6:45 PM, Joël Conraud wrote: > Like yourself, I initially though that it would be able to deal with this, >> but it doesn't seem to (and there is probably a very good reason why it >> can't). >> > > I would be interested in knowing this "very good reason why it can't". I'

Re: Cherry-picking merges

2010-04-29 Thread Daniel Becroft
On Thu, Apr 29, 2010 at 9:17 PM, Vadym Chepkov wrote: > > On Apr 29, 2010, at 3:47 AM, Daniel Becroft wrote: > > > > [b2]$ svn merge --dry-run ^/branches/b1 >> --- Merging r2 through r4 into '.': >>C README >> Summary of conflicts: >> Tr

Re: Cherry-picking merges

2010-04-29 Thread Daniel Becroft
On Thu, Apr 29, 2010 at 10:08 AM, Vadym Chepkov wrote: > Hi, > > I know, this is maybe not the best practice, but, unfortunately, our > subversion users do this all the time: they merge form one branch to another > back and forward. > The question is, how to properly do it without introducing co

Re: Programming a Watcher File

2010-03-08 Thread Daniel Becroft
On Wed, Mar 3, 2010 at 2:26 AM, David Weintraub wrote: > One of the tech leads wants to be able to program a watch file, so > that when a certain set of developers change a particular file, > certain other developers get notified. Thus, we need to be able to > program what files, what developers

Re: Subversion 1.6.9 Released

2010-01-21 Thread Daniel Becroft
On Fri, Jan 22, 2010 at 8:56 AM, Hyrum K. Wright < hyrum_wri...@mail.utexas.edu> wrote: > I'm happy to announce Subversion 1.6.9, available from: > >http://subversion.tigris.org/downloads/subversion-1.6.9.tar.bz2 >http://subversion.tigris.org/downloads/subversion-1.6.9.tar.gz >http://