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

[issue 2022]: merge and update touches conflicted files

From: Peter Lundblad <plundblad_at_google.com>
Date: 2007-01-24 17:20:58 CET

Hi,

I am currently looking into issue #2022, which is about the fact that
update and merge tries to merge in changes to files/directories in a
conflicted state. This cause some problems, such as messing up the
working file with (possibly overlapping) conflict sections from
different merges in the same file. Also, it will leave behind
multiple versions of the conflict files both for properties and text
conflicts.

A simple solution to this would be just to error out when we see a
conflicted entry and ask the user to resolve the conflict and restart
the operation.

A more sophisticated solution would be to Skip this target, leaving it
as is and possibly warn the user at the end of the operation that not
all targets were processed correctly and that the operation needs to
be restarted after the conflict is rresolved.

For update, this solution would just be a little more convenient for
the user. For merging, when we have merge tracking, this would allow
for a noninteractive solution when a series of merges would otherwise
be asking the user about what to do with a conflict (see the
functional specification). I'll come back to this in a separate thread.

The Skip solution gets a bit more complicated though, since, in the
update case, we need to stop bumping all entries' revisions in the end
and only do that for parts of the tree that the editor drive didn't
touch. But I think it makes sense to do that anyway and who's scared
by some internal libsvn_wc hacking;)

Therefore, I propose the more complicated skip solution. I haven't
decided what Skip means exactly for directories: also skip children or
just leave the directory at the old revision and behave as-if each
child was updated separately.

Any objections to this proposal?

Thanks,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 24 17:21:28 2007

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