Re: [Monotone-devel] merging interface

[Christof Petig]

Richard Levitte - VMS Whacker schrieb:
> Hmm, I'm not sure I'm fond of having conflict markers committed.
> Apart from the apparent problems with someone trying to compile a
> marked file and resolving it in a quick-and-sloppy manner, there's
> also this foul taste in my mouth when people are trying to use their
> version control tool as a communication device.

Actually my proposal was different:

Merge all automatically possible files and store their merged data into 
the/a working copy. Remember conflicts (name,common ancestor,both 
leaves) in a version controllable file and delete the corresponding 
files. Unless committed this merge command would not alter the database 
at all.

Provide a command to resolve conflicts file by file with a 3way merge 
command. (monotone resolve [file])

[intermediate states might be commitable]

> Also, there's an issue that I didn't see raised at all: how do we deal
> with binary files?

The way we did before: rely on the user to specify a suitable 3way or 
2way merge program.

   Christof

signature.asc
Description: OpenPGP digital signature