[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: <cmpilato_at_collab.net>
Date: 2002-02-08 16:58:34 CET

Philip Martin <philip@codematters.co.uk> writes:

> All three versions of the conflicting line are available. I think
> your proposal means that only two of those are visible. Yes, the
> third is available from the repository, but getting it is a little
> tricky. I need to know the revision of the file I was using before I
> ran 'svn up' and that requires recording it *before* invoking the
> command - once I see the conflict it is too late. [One change I
> would like to see to conflict reporting is to put the revision
> numbers into the rej-file. Conflict resolution, like version
> control, is all about history.]

Hm... In my (Vlad's, really, I just fleshed it out a bit) proposal,
if no conflict occurs at all, the user sees nothing out of the
ordinary. He has a working file that contains his local mods, and a
text-base that doesn't.

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.

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.