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

Re: svn commit woes when merge created a new file

From: Michael Wood <mwood_at_its.uct.ac.za>
Date: 2003-07-16 09:13:48 CEST


On Mon, Jul 14, 2003 at 07:15:43AM -0700, Richard Thombs wrote:
> I'm pretty new to SubVersion, so please forgive me if this isn't the
> right list to be asking on.

This is the right list for now. At some point the svn-users mailing
list will be revived at which point things like this should be posted
there instead.

> I'm having a problem successfully committing files that were created as
> the result of an svn merge.
> For example, I have a branch in which I created a new file.
> I check out the main trunk, and merge the branch into it. Everything
> looks fine, the new files are marked with A + on the log, and svn
> status shows them as being new.
> However, when I do an svn commit, I'm told that the copy failed because
> the file came from a different repo. Now this is just plain not true, I
> only have the one repository.
> I'm running on WinXP, and all my repository URLs are of the form
> file://.

Please provide more information. What version of the client are you
using? If you can show the actual commands you typed and the error
messages they generated it would be much easier to help.

Also, if you can reproduce this with a sequence of steps on a new
repository it might also help with tracking this down.

e.g. do you get the problem if you do something like this:

cd \temp
svnadmin create repo
svn mkdir -m "make trunk" file:///temp/repo/trunk
svn mkdir -m "make branches" file:///temp/repo/branches
svn cp -m "branch from trunk" file:///temp/repo/trunk file:///temp/repo/branches/branch1
svn co file:///temp/repo/branches/branch1 wc
echo "test" >wc/file1.txt
svn add wc/file1.txt
svn commit -m "add file1.txt on branch" wc
deltree /y wc
svn co file:///temp/repo/trunk wc
svn merge -r3:4 file:///temp/repo/branches/branch1 wc
svn commit -m "merge branch1 into trunk" wc

If that does not demonstrate the problem, what are you doing

Michael Wood <mwood@its.uct.ac.za>
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 16 09:14:46 2003

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

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