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

Re: 1.8 Progress

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Wed, 16 Jan 2013 15:16:45 +0000

"C. Michael Pilato" <cmpilato_at_collab.net> writes:

> Is there a chunk of this work that can be easily subcontracted out to
> another of us devs? Tests are probably the obvious option, assuming that
> there lives someplace public a thorough enough design doc from which to work
> when coding test expectations.

The high-level veiw of this feature is that if the local edits in:

   svn mv ...
   svn mv ...
   local edits to move destination
   svn up

causes update to generate tree-conflicts on the move source then running

   svn resolve --accept mine-conflict

on the tree-conflicts (possibly multiple times if there are nested
moves) resolves the tree-conflicts by updating the move destination so
that the final state is as if the update was done before the moves:

   svn up
   svn mv ...
   svn mv ...
   local edits to move destination

The result is that the moves can be committed and look like moves.

There may still be conflicts in the final state: text and/or property if
the incoming changes cannot be merged with the local edits, and tree if
the local edits obstruct the incoming changes.

Some remaining tasks:

   - delete should remove working items

   - notifications

   - switch instead of update

   - finite depth update conflict

   - tests (may need notifications)

I plan to work on delete next.

Certified & Supported Apache Subversion Downloads:
Received on 2013-01-16 16:17:28 CET

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

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