Re: Question about excessive mergeinfo

2010-01-17 Thread Geoff Rowell
On Thu, Jan 14, 2010 at 7:58 AM, Javier Sanz wrote: > That's an awesome hook to limit svn:mergeinfo propagation, but > unfortunately it is not viable for complex repositories :(. > > Let's hope Subversion 1.7 helps us with this. > > On Wed, Jan 13, 2010 at 11:46 AM, Stein Somers wrote: >>> I have

Re: Question about excessive mergeinfo

2010-01-14 Thread Javier Sanz
That's an awesome hook to limit svn:mergeinfo propagation, but unfortunately it is not viable for complex repositories :(. Let's hope Subversion 1.7 helps us with this. On Wed, Jan 13, 2010 at 11:46 AM, Stein Somers wrote: >> I have a pre-commit hook to detect mergeinfo >> below root, and remove

Re: copying from another branch [Question about excessive mergeinfo]

2010-01-13 Thread Stein Somers
On 12/01/2010 10:40, Ulrich Eckhardt wrote: Why only merge a part of the initial changeset? Well, you said I should merge, and I only want a part! Okay, first of all, I have no question. I just brought this up to illustrate that excessive mergeinfo exists and you shouldn't assume you're doin

Re: Question about excessive mergeinfo

2010-01-13 Thread Stein Somers
I have a pre-commit hook to detect mergeinfo below root, and remove it whenever it occurs For clarity: the pre-commit hook detects and rejects. The one removing the mergeinfo is me, using svn propdel. Someone asked for the hook code, here it is. It's not my submission for a beauty contest an

Re: Question about excessive mergeinfo

2010-01-12 Thread Geoff Rowell
On Mon, Jan 11, 2010 at 8:28 AM, Stein Somers wrote: > No explanation here, and not the same symptoms, but you're not the only one > struggling with it. I have a pre-commit hook to detect mergeinfo below root, > and remove it whenever it occurs, which is rare. The repository has only > mergeinfo o

Re: Question about excessive mergeinfo

2010-01-12 Thread Ulrich Eckhardt
On Monday 11 January 2010, Stein Somers wrote: > > I think SVN wants you to not copy the file/dir but instead to merge the > > revision where it was added to the branch. > > Interesting idea, but as far as I get it it seems a complicated process: > - In the WC's target directory, merge a part of

Re: Question about excessive mergeinfo

2010-01-11 Thread Stein Somers
I think SVN wants you to not copy the file/dir but instead to merge the revision where it was added to the branch. Interesting idea, but as far as I get it it seems a complicated process: - In the WC's target directory, merge a part of the changeset that created (or last moved) the wanted subd

Re: Question about excessive mergeinfo

2010-01-11 Thread Ulrich Eckhardt
On Monday 11 January 2010, Stein Somers wrote: > No explanation here, and not the same symptoms, but you're not the only > one struggling with it. I have a pre-commit hook to detect mergeinfo > below root, and remove it whenever it occurs, which is rare. Doh. Wish I had had that idea earlier. > W

Re: Question about excessive mergeinfo

2010-01-11 Thread Stein Somers
No explanation here, and not the same symptoms, but you're not the only one struggling with it. I have a pre-commit hook to detect mergeinfo below root, and remove it whenever it occurs, which is rare. The repository has only mergeinfo on root directories, merges are done only on roots, no swit

Re: Question about excessive mergeinfo

2010-01-09 Thread Dave Huang
On 1/9/2010 11:36 AM, David Huang wrote: On Jan 9, 2010, at 7:58 AM, Geoff Rowell wrote: I follow a few rules to avoid this: 1) Remove obsolete merge info as part of the branch creation process (svn pd -R svn:mergeinfo /my/branch). I don't do that regularly (but have done it once or twice), b

Re: Question about excessive mergeinfo

2010-01-09 Thread David Huang
On Jan 9, 2010, at 7:58 AM, Geoff Rowell wrote: > I follow a few rules to avoid this: > 1) Remove obsolete merge info as part of the branch creation process > (svn pd -R svn:mergeinfo /my/branch). I don't do that regularly (but have done it once or twice), but from my understanding, that fixes t

Question about excessive mergeinfo

2010-01-08 Thread Dave Huang
Hi, I'm using svn 1.6.6 to merge a single revision from trunk to a branch, and am getting a bunch of seemingly-unneeded mergeinfo. I've read http://blogs.open.collab.net/svn/2009/11/where-did-that-mergeinfo-come-from.html , but as far as I can tell, it doesn't address what I'm seeing. Trunk ha