[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge bug? or I am missing something...

From: Brian Gideon <briangideon_at_yahoo.com>
Date: Sat, 19 Jul 2008 18:58:39 -0700 (PDT)

On Jul 19, 11:03 am, Eric Liprandi <eric.lipra..._at_gmail.com> wrote:
> Brian,
>
> Thanks for the reply.
> You nailed it. This is exactly the situation we are having.
> I have been manually removing those mergeinfo props as I was educating
> myself on how they work.
> We do merge at the root.
> It seems that the issues started appearing when people started adding
> files in the original branch that were not in the destination branch.
> To make matters worse, I think some engineers have been merging at the
> subfolder level every now and then.
> We have updated our best practices to avoid those.
>

Yeah, I would avoid merging at a subfolder until the issue is
resolved. Also, make sure those useless svn:mergeinfo properties have
been removed from the children recursively *before* you commit any
changes on any branch. Once they get committed to the repository it
mucks with the results in the log viewer and the only way to fix it is
to do a dump/load and filter them out that way. I had to do that
after I figured all of this out and it wasn't easy because I had to
write a custom app that processed the dump file.

> I am still learning about SVN from the admin side... do you know if by
> chance I could create a "hook" to remove the mergeinfo prop for any
> file below the root (~/Branches/Branch123)?

I'm still learning Subversion as well so I'm definitely not an
expert. But, I don't see why shouldn't be able to write a hook script
that does that for you.

By the way, I actually see this a pretty big outstanding issue right
now. If you continue to let the svn:mergeinfo proliferate unabated it
will eventually be attached to every single file in your repository
and anytime you do a merge it will have to modify each of those files
even if they didn't change...at least I think that's what would happen.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-20 08:33:22 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.