> From: Z W [mailto:mpc8250_at_gmail.com]
> Sent: Wednesday, May 08, 2013 8:25 PM
> To: Andrew Reedick
> Cc: users_at_subversion.apache.org
> Subject: Re: How to remove revision number in mergeinfo eligible list
>
> Hi Andrew
>
> Thanks for taking the time to respond.
> We did as told step by step and the result is the same - revision number is still in eligible list at the final step
>
> [root@host newbranchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk
> r6554
> r9946
> [root_at_host newbranchWC]# svn propget svn:mergeinfo .
> /root/trunk:6560,9804,9806,9836,9874-9876,9880-9881,9899-9900,9951-9952
> [root@host newbranchWC]# svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk
> [root_at_host newbranchWC]# svn propget svn:mergeinfo .
> /root/trunk:6560,9804,9806,9836,9874-9876,9880-9881,9899-9900,9951-9952
> [root@host newbranchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk
> r6554
> r9946
>
> We wonder if it has to do with the rev number change itself.
> That 6554 rev number is about /root/Trunk creation from svn mkdir
> The following rev number 6560 is about renaming /root/Trunk to /root/trunk
> Then the following rev number 9804 is about svn copy of dir A to https://some.url.com/svn/root/trunk/A
> Then the following rev number 9806 is about svn copy of dir B to https://some.url.com/svn/root/trunk/B
>
> Would such actions impact the very first rev number for folder https://some.url.com/svn/root/Trunk ?
> We use SVN 1.6
The good news is that I was able to do a merge that produced output similar to yours.
The bad news is that you are probably merging unrelated branches... What branch is your workspace set to? (svn info) And what is the common ancestor between /root/Trunk and the workspace branch? You can try 'svn merge --ignore-ancestry', but I don't think it will make a difference since your branches are probably very unrelated.
In other words, 'svn merge' should have produced some output. The fact that it didn't implies that there was no merging to be done. I have no idea why 'svn mergeinfo --show-rev eligible' would still list revs.
Received on 2013-05-09 15:42:53 CEST