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

Re: inconsistency between mergeinfo records

From: Sergey Azarkevich <azarkevich_at_gmail.com>
Date: Wed, 18 Feb 2015 17:41:25 +0300

>
> >
> > I'm wondering why there is a difference in how mergeinfos are recorded
> > based on whether the merge is done using --record-only or not.
> > To demonstrate the case, I've put together a repro-script (for Windows
> > - see attachment).
>
>
Just observation...

These 2 merges use different ranges of revisions.

C:\test\test2checkout>svn merge file:///C:/test/test2/A B --record-only
--- Recording mergeinfo for merge of r2 through r5 into 'B':
...

C:\test\test2checkout>svn merge file:///C:/test/test2/A B
--- Merging r3 through r5 into 'B':
...

Using explicit range of revisions same as for --record-only lead to equal
modifications in wc:
C:\test\test2checkout>svn merge file:///C:/test/test2/A B -r 2:5
--- Merging r3 through r5 into 'B':
...

So, the actual quesion is: why revision range for merge calcualted
differently.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3099523

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-02-18 15:41:49 CET

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

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