Correct me, if I am wrong, but there seems to be a bit of a hype around
the merge tracking, which, if resolved, would make the life of people,
who just start to get involved with the issue, easier.
Here is example -
The svn book describes how merge should be done, recording data about
the merged branches in the commit message.
The Svnmerge.py wiki, however, says in the FAQ - "Merging the same
change twice isn't usually a problem. It's a problem in two situations:
a) if you don't want a certain change, and b) If your trunk and your
branch are both diverging". Which means that in all other cases merging
all again and again should not be a problem.
So basically the svn book tells only half of the truth. I think, if this
is corrected, many new users will feel relieved.
Also, related to this, and with all due respect for the author of the
svn book - but my feeling is that it has an extremely negative style. I
can understand the need to warn people, but if it is cleaned up from all
potential dangers and simply tells HOW things should be done, instead of
mentioning all possible disasters one can end up in - it would read much
nicer. Honestly, after reading for about 1-2 hours one day, I almost got
headache and started to wonder why am I trying to use subversion if it
is full with traps and possible disasters :)
Regards,
Iv
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-02-08 11:56:04 CET