Re: User is always right (was Re: Merger not Merging -- What I would like a merge process to do.)

On Thu, Jan 27, 2005 at 11:58:37AM +0000, matthew ford wrote:
> What I suggested was adding
> "the diff between what was and what is when applied (patched) to someone
> elses what was will make theirs what is"
> or a cleaned up version there of.

I understand what you mean by the above though I had to read it a couple
of times and assume a lot of people would not. And actually it is what
is already written in chapter 4 section 3[1] of the book in a longer
version.

> The above would have assisted my assimulation of the SVN docs.

I guess we all assimilate in different ways ;-)

> As you can see it was not the details of diff that I was missing but a
> clear statement of the basic diff/patch process.
> Not too much to ask that this be added to the SVN docs?

But then again, the diff/patch process is what Subversion is handling
for you. When I read 4.3.1[2] it fully explains how I merge a change
from trunk to my own branch. From my perspective this is sufficient.

Of course there will always be people having trouble understanding the
way things are described in the docs and that's what this mailing list
is for. It's impossible to write documentation which suits everybody
and to start filling redundant information into the documentation would
be worse than some people not getting it the first time around.

[1]: <http://svnbook.red-bean.com/en/1.1/ch04s03.html>
[2]: <http://svnbook.red-bean.com/en/1.1/ch04s03.html#svn-ch-4-sect-3.1>

-- 
Cheers,
- Jacob Atzen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org