You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by James French <Ja...@naturalmotion.com> on 2012/06/25 18:26:24 UTC
moving files in repobrowser generates mergeinfo
Hi group,
I know this could be seen as a tortoise svn question, but I was wondering if there was anything in subversion itself that would want to put merge info on files moved via a repo browser (1.6 and 1.7). This does not happen when doing moves client side (tortoise or command line).
Cheers,
James
RE: moving files in repobrowser generates mergeinfo
Posted by James French <Ja...@naturalmotion.com>.
________________________________________
From: Stefan Sperling [stsp@elego.de]
Sent: 26 June 2012 10:06
To: James French
Cc: users@subversion.apache.org
Subject: Re: moving files in repobrowser generates mergeinfo
On Tue, Jun 26, 2012 at 09:47:06AM +0100, James French wrote:
> Thanks Stefan. I wish it didn't add that mergeinfo. Actually if mergeinfo was entirely internal I wouldn't care what it did (as long as it worked). Its all the checkin clutter that upsets me.
How much clutter do you have? If you're using 1.7 it shouldn't be all
that bad anymore, see http://subversion.apache.org/docs/release-notes/1.7.html#subtree-mergeinfo-recording
Quite a lot has built up. We're not using 1.7 yet. I am doing preliminary testing/upgrading scripts etc. I will also delete all non-root merge info. My hope is to get to a situation where mergeinfo only exists on the root as we always merge from the root. 1.7 will help things I am sure but it still seems that mergeinfo will probably still creep in due to per-file merges to resolve tree conflicts where people forget to check 'ignore ancestry', and through repobrowser renaming. I am hoping 1.8 will resolve the first of these issues.
Re: moving files in repobrowser generates mergeinfo
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Jun 26, 2012 at 09:47:06AM +0100, James French wrote:
> Thanks Stefan. I wish it didn't add that mergeinfo. Actually if mergeinfo was entirely internal I wouldn't care what it did (as long as it worked). Its all the checkin clutter that upsets me.
How much clutter do you have? If you're using 1.7 it shouldn't be all
that bad anymore, see http://subversion.apache.org/docs/release-notes/1.7.html#subtree-mergeinfo-recording
RE: moving files in repobrowser generates mergeinfo
Posted by James French <Ja...@naturalmotion.com>.
________________________________________
From: Stefan Sperling [stsp@elego.de]
Sent: 25 June 2012 18:59
To: James French; users@subversion.apache.org
Subject: Re: moving files in repobrowser generates mergeinfo
On Mon, Jun 25, 2012 at 07:55:05PM +0200, Stefan Sperling wrote:
> On Mon, Jun 25, 2012 at 05:26:24PM +0100, James French wrote:
> > Hi group,
> >
> > I know this could be seen as a tortoise svn question, but I was wondering if there was anything in subversion itself that would want to put merge info on files moved via a repo browser (1.6 and 1.7). This does not happen when doing moves client side (tortoise or command line).
> >
> > Cheers,
> > James
>
> See Paul Burba's explanation at
> http://svn.haxx.se/users/archive-2010-11/0466.shtml
Actually, this link is better because haxx.se messes up ascii graphs:
http://mail-archives.apache.org/mod_mbox/subversion-users/201011.mbox/%3CAANLkTin0xJwxg78rU-83QafOt-bcfgML_pB2AHWt2z1s%40mail.gmail.com%3E
Thanks Stefan. I wish it didn't add that mergeinfo. Actually if mergeinfo was entirely internal I wouldn't care what it did (as long as it worked). Its all the checkin clutter that upsets me.
Re: moving files in repobrowser generates mergeinfo
Posted by Stefan Sperling <st...@elego.de>.
On Mon, Jun 25, 2012 at 07:55:05PM +0200, Stefan Sperling wrote:
> On Mon, Jun 25, 2012 at 05:26:24PM +0100, James French wrote:
> > Hi group,
> >
> > I know this could be seen as a tortoise svn question, but I was wondering if there was anything in subversion itself that would want to put merge info on files moved via a repo browser (1.6 and 1.7). This does not happen when doing moves client side (tortoise or command line).
> >
> > Cheers,
> > James
>
> See Paul Burba's explanation at
> http://svn.haxx.se/users/archive-2010-11/0466.shtml
Actually, this link is better because haxx.se messes up ascii graphs:
http://mail-archives.apache.org/mod_mbox/subversion-users/201011.mbox/%3CAANLkTin0xJwxg78rU-83QafOt-bcfgML_pB2AHWt2z1s%40mail.gmail.com%3E
Re: moving files in repobrowser generates mergeinfo
Posted by Stefan Sperling <st...@elego.de>.
On Mon, Jun 25, 2012 at 05:26:24PM +0100, James French wrote:
> Hi group,
>
> I know this could be seen as a tortoise svn question, but I was wondering if there was anything in subversion itself that would want to put merge info on files moved via a repo browser (1.6 and 1.7). This does not happen when doing moves client side (tortoise or command line).
>
> Cheers,
> James
See Paul Burba's explanation at
http://svn.haxx.se/users/archive-2010-11/0466.shtml