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

Re: #3334: schedule a WC item for re-add when tree-conflicted - help please!

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 13 Jan 2009 14:07:31 +0000

On Mon, 2009-01-12 at 18:33 +0000, Julian Foad wrote:
> Hi WC experts, tree conflict folks, and others.
>
> I'm trying to solve issue #3334 as explained below,
> in /branches/issue-3334-dirs/. (Patch attached of the current state of
> the branch.)
[...]

The first things I'll do next are: write a dedicated test for this, and
compare the results of the two scenarios below to see empirically what
I'm missing in terms of WC state.

- Julian

> Definition
> ==========
>
> D1 should end up exactly the same in these two scenarios:
>
> New scenario:
> [[[
> svn checkout -r3 # in which D1 exists
> modify_d1 # make local mods in D1
> svn update -r4 # tries to delete D1
> svn resolve --accept=mine # keep the local, re-added version
> ]]]
>
> Existing scenario:
> [[[
> svn checkout -r4 # in which D1 does not exist
> svn copy -r3 D1 . # make a pristine copy of D1_at_3
> modify_d1 # make local mods in D1
> ]]]
>
> where modify_d1 makes property changes to D1 itself and/or
> adds/deletes/modifies any of D1's children.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1021939
Received on 2009-01-13 15:08:02 CET

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