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

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

From: matthew ford <matthew.ford_at_forward.com.au>
Date: 2005-01-27 12:58:37 CET

Hi Jacob,

Jacob Atzen wrote:

[..]
> And most users of Subversion are developers. And most developers know
> diff as it's a standard way of telling the difference between two files.
> If not, it's not too hard to research the subject yourself.
>
> > As I mentioned in another posting, a good working knowledge of diff
> > appears to be a pre-requesite for using merge correctly. But not all
> > the users coming to subversion have a good working knowledge of diff.
> > I have suggested this be adressed in some way in the documentation
> > since subversion appears to be too far down the track to change the
> > existing CLI merge to accomodate these users. (Perhaps 'smart merge'
> > can address this.)
>
> The documentation on merge says:
>
> It's time to use the svn merge command. This command, it turns
> out, is a very close cousin to the svn diff command (which you
> read about in Chapter 3).
>
> Now chapter 3[1] says:
>
> ...which prints out file changes in unified diff format.
>
> If you do not know what unified diff format is this might be a good time
> to visit Google.

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.
The above would have assisted my assimulation of the SVN docs.
I was not looking for a discription of "unified diff format", merge
handles that behind the scenes.

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?

[..]
>
> Oh and BTW, you have a bad habit of starting new threads instead of
> following up on the current. I just counted 6 new posts on the current
> subject. Please stick to one thread as this makes it much easier to
> locate the posts in the users archive[3].

Sorry about the breaks in threads. I am was Outlook Express.
Just changed to ThunderBird. Hope that fixes it.

matthew

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 27 13:02:49 2005

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