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

Re: svn_wc_conflict_result_choose_repos found dangerous?

From: Kyle McKay <mackyle_at_tigris.org>
Date: 2007-07-19 21:57:56 CEST

On Jul 18, 2007, at 09:24, "David Glasser" <glasser@mit.edu> wrote:
> What does perforce do for the equivalent case for merges?

Perforce requires you to make an explicit choice whenever you are
submitting a change to a revision that is no longer the head revision
or you are "integrat"ing from one place to another and the
destination file exists. (The Perforce "integrate" command is a
combination merge/copy command -- if the destination file exists you
get a merge, if it doesn't you get a copy.)

You may choose one of the following to "resolve" the situation:

1. "accept theirs" which chooses the destination file in its
entirety, completely overwriting any changes you've made.

2. "accept yours" which chooses your file in its entirety, completely
overwriting the destination file.

3. "accept safe" which picks the file that has been changed, but if
both have been changed, does nothing and requires you to make another
choice. (For example, if you merge from file_a to file_b and then
file_a subsequently changes a later "accept safe" merge will choose
the new version of file_a. Conversely when file_b subsequently
changes. If they both have been changed, the file gets skipped and
must be "resolve"d using another method.)

4. "accept merged" which attempts to automatically merge the changes
together and use the newly merged file. If there are any merge
conflicts, an error is produced and further action must be taken on
the file. In actuality, this option first attempts an "accept safe"
and only tries the merge if "accept safe" fails.

5. "edit merged" which performs a merge inserting conflict markers
for conflicts and opens an editor on the merged file. After quitting
the editor you come back to a prompt.

6. "accept edited" which accepts the edited file. It asks for a
confirmation if there are still any change markers in the file.

In practice the "accept merged" usually does the right thing
automatically (except in the presence of perverse merge history)
unless there are conflicts or both source and destination have been
changed in the case of a binary files. The last 3 options above (4,
5, 6) are not available for binary files.

The above was intended to describe the choices a Perforce user must
make. Various command line minutiae etc. involved in actually using
Perforce have been omitted for clarity.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 19 21:57:05 2007

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.