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

Re: Merging moved files

From: Michael W Thelen <thelenm_at_cs.utah.edu>
Date: 2004-05-14 23:02:06 CEST

* Simon McClenahan <smcclenahan@healthcompartners.com> [2004-05-14 11:02]:
> OK, if you think this is clearer, I'll start from scratch.
> C:\projects\test\trunk>svn list --recursive -v
> 15 smcclena May 14 10:43 origdir/
> 15 smcclena 24 May 14 10:43 origdir/file.txt
> Create the branch
> C:\projects\test>svn copy trunk branches/reorg
> A branches\reorg

Just as clarification for others trying to reproduce the problem, there
needs to be a commit at this point, too. Otherwise you'll get problems
when trying to do the 'svn mv origdir/file.txt newdir' later on.
Following your transcript (thanks), I was able to reproduce the results
you're seeing: it does seem that trunk modifications to origdir/file.txt
are not included in newdir/file.txt when the merge happens.

-- Mike

Michael W. Thelen
It is a mistake to think you can solve any major problems just with potatoes.
                -- Douglas Adams

Received on Fri May 14 23:04:44 2004

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.