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

Re: Merging an altered and renamed file

From: Joshua Varner <jlvarner_at_gmail.com>
Date: 2005-12-05 17:56:12 CET

On 12/5/05, Simon Large <simon@skirridsystems.co.uk> wrote:
> Matthew wrote:
> > What did I do:
> > I was trying to merge a branch with my working copy ( trunk ).
> > Branch :
> > - Edited one file (file1.txt) and renamed it to file2.txt in 1 commit
> > WC :
> > - Edited the same file (file1.txt), different text of course and even a
> > different location of edit.
> >
> > What happened:
> > When merging these two, it simply adds file2.txt to the result, but neglects the
> > changes made in my current working copy. Because the rename and changes were
> > done in 1 commit, I cannot merge just the change.
> >
> > What I Expected:
> > - The changes in file1.txt were first checked against eachother and in case of a
> > conflict, conflicthanding (as normal) is expected. And then the result should
> > have been file2.txt.
> This is rather a corner case, so it is not entirely obvious what
> subversion should do. In any event, you would need to ask this question
> on the subversion users list as it is the svn library rather than TSVN
> which is doing the actual merging here.
subversion currently does not merge changes in renamed files, since it is
currently implemented as two separate operations: a delete and an add
with history. If file1.txt had not had changes it would have been deleted, but
since changes existed subversion left the file, to avoid losing information.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Dec 5 18:11:17 2005

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

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