subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: Reorganizing a live tree
Date Thu, 18 Feb 2010 11:15:14 GMT
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

Mime
View raw message