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

Re: Reorganizing a live tree

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 18 Feb 2010 12:15:14 +0100

On Thu, Feb 18, 2010 at 02:49:35AM -0800, Kenneth Porter wrote:
> If I move a file (say, to a new subdirectory) and commit, and
> another user then edits the file from a pre-move WC, what happens
> when he updates his WC? Do his edits get merged to the file in the
> new location?

See http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html

Received on 2010-02-18 12:16:01 CET

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

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