Re: filename extensions of conflicted files

"Grundberg Michael" <michael.grundberg@aerotechtelub.se> writes:

> I investigated it some more and it seems that a conflict on update
> produces an .mine file while a conflict on a merge produces an
> .working file.

What the heck? You're right!

If you look at libsvn_wc/update_editor.c:install_file(), it's passing
suffixes of {.mine, .rX, .rY} to the loggy call to svn_wc_merge().

But then in libsvn_client/diff.c:merge_file_changed(), we're passing
suffixes of {.working, .merge-left.rX, .merge-right.rY} to the same
function.

Why aren't we being consistent?

Granted, our conflict code records the three fulltext names in the
entries file, so any set of suffixes will work. But this seems like
needless confusion to users.

Do people agree that we should only use one set of suffixes? If so, I
vote that merge_file_changed() should change to match our
update_editor. Those are the suffixes that the Book documents.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 11 14:54:15 2003