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

Re: Fwd: svn1.5 seems to fail simple merge-tracking scenario

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 8 Jun 2009 09:23:57 -0400

On Mon, Jun 8, 2009 at 9:22 AM, Trent
Nelson<svn-users-list_at_trentnelson.com> wrote:
> On Fri, Feb 20, 2009 at 09:14:00PM +0000, Trent Nelson wrote:
>> On Fri, Feb 20, 2009 at 03:20:32PM -0500, Mark Phippard wrote:
>> > On Fri, Feb 20, 2009 at 3:10 PM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
>> > >> I wrote the text that was quoted, and it is not as absolute as has
>> > >> been made out.  You can still use the branch.  The blog you were
>> > >
>> > > But you can't reintegrate it, right? Which kind of makes it unuseable.
>> >
>> > Sure you can.  This works:
>> >
>> > $ svn co ^/branch1
>> > $ svn ci -m "work on branch"
>> > $ svn merge ^/trunk
>> > $ svn ci -m "Catch up with trunk"
>> >
>> > On trunk WC
>> > $ svn merge --reintegrate ^/branch1
>> > $ svn ci -m "Commit all work from branch1"
>> > Committed revision 100
>> >
>> > Back on branch1
>> > $ svn merge --record-only -r100 ^/trunk
>> > $ svn ci -m "Mark r100 as merged"
>
>    -r100 is semantically equivalent to -r0:100, right?

No, it is a typo that I think would fail. It should be -c 100.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2360284
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-08 15:24:54 CEST

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