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

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

This message: [ Message body ]
Next message: lasdka 88: "version at which non-interactive was added to svn add"
Previous message: Kenneth Porter: "Reorganizing a live tree"
In reply to: Kenneth Porter: "Reorganizing a live tree"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]