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

Re: Patch command execution

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-02-08 17:10:29 CET

cmpilato@collab.net writes:

> If any conflict occurs, the user has:
> - working file: just his changes
> - text-base: just the changes from the repository
> - rej-file: both sets of changes, with conflict markers where
> conflicts exist.
> What's missing that you need to fill your three-view quota? The
> original working_file before the user edited? And if so, why is that
> important? `svn diff' will show you what portions of your work differ
> from the new text-base. I think I'm failing to understand how you
> tend to do conflict resolution.

I gave you a worked example. What's missing is the original line(s),
before they were edited to cause the conflict. With your scheme I see
two "answers" but I don't see the "question".

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:05 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.