subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Komka Péter <komka.pe...@prolan.hu>
Subject Clarify external merging
Date Fri, 14 Mar 2014 17:08:29 GMT
The SVN Book is not fully clear for me about the external merging.
(svn-book.html#svn.advanced.externaldifftools.merge)

There is 5 files (5 arguments, 5 filenames).
Which of them may serve as input to the merge tool (meld), with what (initial)
content, which of them may serve as output from meld, which of them (if any)
should leave unchanged?
What exactly is the 5th ("working") file?

After returning from meld, I am prompted again.
(Am I prompted too, when the "merged" file was written to? Why?)
What should I type into?
If meld was called (among others) with the "mine" file, and, possibly after
some modifications, I would like to choose this file as final result, then
should I type 'mf'?
In this case, must this "mine" file be copied (by the wrapper py-script or
something) to the "merged" filename? (Why?)

Or, if meld was called (among others) with the "theirs" file, and, possibly after
some modifications, I would like to choose this file as final result, then
should I type 'tf'?
In this case, must this "theirs" file be copied to the "merged" filename? (Why?)

If I would like to choose the "merged" file (4th arg), then should I type 'r'?
(Or something else?)

My laptop screen has limited size. At most 2 panel fit in.
Can I do external merging with 2-way mode? (Calling meld with only 2 arguments.)
What arguments should meld be passed to?

In 2-way merging there is a clear goal: I know that I am finished when either:
a) the two sides are the same, or
b) one of the sides (the additions) is "all-wanted" and the other side is "none-wanted".

In 3-way merging (I am unexperienced): when am I finished? When is the goal reached?
(If I miss something then that portion (conflict place) may be reverted to the
"base" version?)

In an attempt, svn produced (unversioned) ".edited" files. May I simply remove them?
What to with them?

Is it possible to first postpone all mergings, then use meld to some of the unversioned
(.working, .merge-left.rxxx, ..) files, then issue a 'svn resolve'?
If, for example, I melded xx.working and xx.merge-left.r555, and, after some modifications,
I find xx.merge-left.r555 perferct, then what 'svn resolve --accept ???' command shoud
I issue?
If I "--accept working", then what will be accepted: the file which (now) has the
name xx.working, or something else (for example xx, or some "more true" working version)?

-- 
Péter



Mime
View raw message