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

Re: Issue with merging files containing spaces

From: Purple Streak <mrpurplestreak_at_googlemail.com>
Date: Sun, 12 Oct 2008 15:09:29 +0100

2008/10/12 Karl Fogel <kfogel_at_red-bean.com>:
> The instructions there are not exact enough to be sure I'm using the
> right reproduction recipe.

Sorry - I thought i'd been fairly careful but I guess i'd assumed the
other steps which are pretty much as you assumed, except I did commit
the merge.

> If you can package up your recipe in a
> similar, self-contained form, that would be very helpful! That way
> there can be no doubt about exactly what the recipe is. A .bat script
> is fine; I can translate.

Sure I can do that. See below. Just to re-iterate this is using
Subversion 1.5.3 on Windows with Apache 2.2.9. All works fine until
the last line which gives the problem. If this works for you on Trunk
could you try 1.5.3 as well if possible?

Thanks for looking at this.

@echo off
rem Setup
svnadmin create c:\svn\repo
svn co http://localhost/svn/repo root
svn mkdir "root/current projects"
svn mkdir "root/current projects/a project"
svn mkdir "root/current projects/a project/trunk" "root/current
projects/a project/branches" "root/current projects/a project/tags"
echo "hello svn" > "root/current projects/a project/trunk/foo.txt"
svn add "root/current projects/a project/trunk/foo.txt"
svn commit -m "setup" root

rem Make a branch and generate 2 working coppies
svn copy -m "branch"
http://localhost/svn/repo/current%%20projects/a%%20project/trunk
http://localhost/svn/repo/current%%20projects/a%%20project/branches/b1
svn co http://localhost/svn/repo/current%%20projects/a%%20project/trunk trunk
svn co http://localhost/svn/repo/current%%20projects/a%%20project/branches/b1 b1

rem modify file in trunk, commit and merge to branch
echo "trunk" > "trunk/foo.txt"
svn commit -m "modify trunk file" trunk
svn merge http://localhost/svn/repo/current%%20projects/a%%20project/trunk b1
svn commit -m "merge to branch" b1
echo "branch" > "b1/foo.txt"
svn commit -m "modify branch" b1

rem update and reintegrate
svn update trunk
svn merge --reintegrate
http://localhost/svn/repo/current%%20projects/a%%20project/branches/b1
trunk

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-12 16:09:42 CEST

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