Re: How do I determine if svn:mergeinfo is corrupt and how would I fix it.

Thanks, I am not entirely sure what people were using for their push / pull
but I'm pushing a standard now.

I think we hit the following problems that made things worse:
- cherry pick merges + merges at levels below root (all are allowed, but
they can make later merges more complex)
- we assumed merge command completion meant all changes merged (didn't
double check with mergeinfo --show-revs eligible)
- possible bugs with earlier clients (1.5 or early 1.6). We have many
ubuntu and debian systems and were unware of wandisco's update site
initially. So, we missed out on the easy way to stay current. We are now
rapidly deploying 1.6.11

PUSH

svn merge --reintegrate --accept postpone URL-branch path-to-workspace
svn mergeinfo URL-branch path-to-workspace --show-revs eligible >
eligible_revs.txt
repeat until nothing left that's eligable

PULL
same pattern, but minus the --reintegrate

I'll go through our merge info data to see if there's anything that looks
like a problem and its not too large after anonimizing it I'll post it for
review.

Thanks again,

On Tue, May 11, 2010 at 7:21 AM, Stefan Sperling <stsp_at_elego.de> wrote:

> On Mon, May 10, 2010 at 12:12:49PM -0400, Peter Kahn wrote:
> > People use the this merge pattern
> >
> > a) PULL - merge trunk-to-branch, resolve, test, commit
> >
> > b) PUSH - merge branch-to-trunk, resolve, test, commit
> >
> > c) Recreate branch (or usually create new story branch and drop old since
> > it's done)
>
> PULL, PUSH, and Recreate branch could be anything.
> Can you describe the exact commands (or button clicks) you are using at
> each of these steps? Without that information it's pretty much impossible
> to tell what the root of your problem might be.
>
> Also, if you could provide your complete mergeinfo that would help:
>
> svn propget -R -v svn:mergeinfo $REPOS_URL > allmergeinfo.txt
>
> Even if it's a lot of output, post all of it.
> You can do search/replace operations on pathnames which are
> confidential if you need to.
>
> Thanks,
> Stefan
>

-- 
Peter Kahn
citizenkahn_at_gmail.com
pkahnpie1_at_AIM
http://www.google.com/profiles/citizenkahn
Awareness - Intention - Action