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

Re: How to remove revision number in mergeinfo eligible list

From: Z W <mpc8250_at_gmail.com>
Date: Wed, 8 May 2013 17:25:29 -0700

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_at_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_at_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_at_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

Sincerely

On Wed, May 8, 2013 at 2:34 PM, Andrew Reedick
<Andrew.Reedick_at_cbeyond.net>wrote:

> > From: Z W [mailto:mpc8250_at_gmail.com]
> > Sent: Wednesday, May 08, 2013 4:09 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 responding; appreciate it.
> > We followed your instruction -
> > svn propget svn:mergeinfo https://.../root/trunk > a.txt
> > svn propget svn:mergeinfo . > b.txt
> > diff a.txt b.txt
> >
> > a.txt returns an empty file
> > b.txt returns empty too.
> >
> > The revision number 6554 change is about the creation of the trunk
> (https://.../root/trunk). In this trunk it has 2 directories A and B.
> > In our working copy directory, it has directories A and B, too.
> > We're trying to merge from the trunk to working copy branch
> >
> > svn mergeinfo ... | grep 6554 returns empty.
>
> Okay... let's try this again.
> 1. checkout a clean workspace.
> 2. cd workspace
> 3. svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk> pre-mergeinfo.txt
> 4. svn propget svn:mergeinfo . > pre-prop.txt
> 5. svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk
> 6. svn propget svn:mergeinfo . > post-prop.txt
> 7. svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk> post-mergeinfo.txt
>
> 8. diff pre-mergeinfo.txt post-mergeinfo.txt
> I expect r6554 to be in pre-mergeinfo.txt and not in
> post-mergeinfo.txt.
>
> 9. diff pre-prop.txt post-prop.txt
> If these files are different, then svn:mergeinfo was updated.
>
>
>
Received on 2013-05-09 02:26:04 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.