[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] merging interface
From: |
Christof Petig |
Subject: |
Re: [Monotone-devel] merging interface |
Date: |
Thu, 18 Nov 2004 09:08:08 +0100 |
User-agent: |
Mozilla/5.0 (X11; U; Linux ppc; de-AT; rv:1.7.3) Gecko/20041007 Debian/1.7.3-5 |
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
- [Monotone-devel] Re: merging interface, (continued)
- Re: [Monotone-devel] merging interface, Christof Petig, 2004/11/17
- [Monotone-devel] Re: merging interface, Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] merging interface, Richard Levitte - VMS Whacker, 2004/11/17
- [Monotone-devel] Re: merging interface, Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] Re: merging interface, Richard Levitte - VMS Whacker, 2004/11/17
- Re: [Monotone-devel] Re: merging interface, Jon Bright, 2004/11/18
- Re: [Monotone-devel] merging interface,
Christof Petig <=
- Re: [Monotone-devel] merging interface (was Re: Status update), derek, 2004/11/17
- Re: [Monotone-devel] Status update, Olivier Andrieu, 2004/11/17
- Re: [Monotone-devel] Status update, Joel Rosdahl, 2004/11/18
- Re: [Monotone-devel] Status update, Nathaniel Smith, 2004/11/20
- Re: [Monotone-devel] Status update, Derek Scherger, 2004/11/20