Am 13.01.2012 10:05, schrieb Lloyd:
> I am trying out svn branching and merging. I have a repository named
> MyRepo, to create a branch I have done the following
>
> Structure of MyRepo is as follows
> =========================
> MyRepo
> -> Branch
> -> Trunk
> -> Tags
>
> First checked out the repository
> ========================
> svn checkout svn://svnserver/MyRepo
Why? You're just adding overhead by checking out the whole content of
the repository, including all branches and all tags. Generally, the
advise is to check out a working copy for just the part you are planning
to work on. I typically have a handful of trunk checkouts, one of each
major release branch and the tags only when I'm building binaries (which
I don't, the nightly autobuild does that here).
> Then created a branch using
> ======================
>
> svn copy svn://svnserver/MyRepo/trunk
> svn://svnserver/MyRepo/Branch/TestMerge -m "test merging"
>
> Then checked out the new branch to a new location (E:\br)
> ===========================================
>
> svn checkout svn://svnserver/MyRepo/Branch/TestMerge
Similarly, why? You have a working copy containing the whole repository.
If you updated that working copy, it would pull the newly created folder
already. Also, something I can't tell from the info provided, if you
check out working copies on top/inside each other, you are up for trouble.
> Then Added a new file to this TestMerge folder, then added in to the svn
> using svn add command, then commited it to the server.
>
> Now I want to merge this change to the trunk using svn merge command, for
> that I have checked out a new working copy (E:\ch),
Again, one more working copy unnecessarily, as you already have one for
the trunk where you can do stuff.
> then executed the merge command
>
> svn merge svn://svnserver/MyRepo/Branch/TestMerge
> svn://svnserver/MyRepo/trunk E:\ch\Trunk
>
> But I get the following error, what am I doing wrong?
>
> "svn: Unreadable path encountered; access denied"
"Trunk" is not the same as "trunk", SVN is case sensitive. BTW: There
are repository-side configurations that disallow commits that would add
files that only differ by their case. A directory containing such files
would be impossible to check out on MS Windows.
Generally, since you are using MS Windows, I'd suggest using
TortoiseSVN, as it provides a friendlier interface where you simply pick
the path from a list instead of manually (mis-)typing it. ;)
Greetings!
Uli
**************************************************************************************
Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at http://www.dominolaser.com
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
Received on 2012-01-13 12:36:00 CET