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

Re: tree-conflicts ng

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 15 Sep 2009 19:47:15 -0400

Yes please :)

On Sep 15, 2009, at 7:38 PM, Neels Janosch Hofmeyr <neels_at_elego.de>
wrote:

> Hi tree-conflicts folks,
>
> I'd like to poke you guys with this scenario:
>
> [[[
> # fred's WC: copy, edit and remove something in three separate
> commits.
> $ svn copy foo bar ; svn ci
> $ $EDITOR bar ; svn ci
> $ svn delete foo ; svn ci
>
>
> # elaine's WC has a local mod on 'foo', and needs to get the new
> changes.
> # she's about to face a tree-conflict.
> $ svn st
> M foo
>
> $ svn up
> C foo
>> local edit, incoming move to ^/bar
> A + bar (moved from ^/foo)
> M bar
> Summary of conflicts:
> Tree conflicts: 1
> # in a sidenote, the above copy+del results in a move
>
> $ svn st
> D C foo
>> local edit, incoming move to ^/bar
>
> $ svn resolve foo
> Resolving tree-conflict on 'foo': local edit, incoming move to ^/bar
> (mt) apply mine to move-target (^/bar), (tf) discard mine/"theirs-
> full",
> (a) see all options? mt
> M bar
> D foo
> Resolved conflicted state of ^/foo
>
> $ svn st
> M bar
> $ svn ci -m "frobnicate."
> ]]]
>
> ~Neels
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2395296

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2395301
Received on 2009-09-16 01:48:26 CEST

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