Am 13.01.2012 13:32, schrieb Lloyd:
> A simple example would be much more helpful than an explanation. And that
> "lower case" was a typo in the mail.
..would have been too easy, eh? ;) Anyhow, I think I know what's wrong:
>>> 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"
I think you simply have the two source paths in the wrong order. The
first one should be the origin and the second one the one with the
modifications, which are then merged into the third one.
Note that the reverse order is not wrong per se, "reverse merging" to
remove a change is a feature.
> Should I be checking out only trunk or only the branch I have to work.
Actually, we here (5 people in adjacent rooms) commit to trunk directly.
This means that changes are tested by others earlier. It also causes a
few issues now and then, but they are easy to resolve because they are
still fresh. If you find someone elses commit causes problems, you can
simply "svn update -r" to an earlier revision and tell the person about
the problem. We only create feature branches for really intrusive
changes that might be unstable for several commits, and of course
release branches to isolate them from later development.
Anyway, getting back to your question, the answer is yes. When working
on a feature branch, you only check out that branch. Then, in order to
merge it back into trunk, you create a separate WC for that. If you then
want to merge a bugfix from the trunk to a release branch, you check out
a third WC. Note that you can also "svn switch" WCs, which is relatively
cheap concerning the bandwidth and time used.
Using a simple filesystem copy allows you to rather quickly create a new
working copy, which you can then switch to the new location. If you have
the whole repo checked out, an update means downloading and storing
every single tag and branch, even those you don't work on. Also, you
can't use the cheap way to clone a working copy to copy just a part.
> Am I doing anything wrong in creating the branch (I did as per
> the book said)?
No, creating the branch looks fine. There are other ways, like doing it
in the working copy (WC->WC copy) or mixed (WC->URL copy), but all are
correct.
Good luck!
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 14:01:23 CET