Re: Warning to Debian Developers regarding BitKeeper

[Walter Landry <wlandry@ucsd.edu>]

Bruce Stephens <bruce+debian@cenderis.demon.co.uk> wrote:
> Walter Landry <wlandry@ucsd.edu> writes:
> 
> > Brian May <bam@debian.org> wrote:
> 
> [...]
> 
> >> So what happens when I conflict is identified? So far I have seen 3
> >> mechanisms:
> >> 
> >> 1. mark the section in the file with both versions (CVS).
> >> 
> >> 2. create a new *.rej file containing all changes that could not
> >> be applied (patch).
> >
> > This is what it does now.  That makes it easy to find out which files
> > didn't merge properly (just "ls -R | grep rej").
> >
> >> 3. 3 way GUI merge (bitkeeper).
> >
> > This is what I'm working on.
> 
> I think the right thing to do is to tie in to the various existing
> tools to do this.  Some tools (perhaps most) make 1 and 2 equivalent.
> For example, in Emacs you can use vc-resolve-conflicts in a buffer
> which contains CVS-marked conflicts and it'll use ediff to merge them.
> tkdiff can also understand CVS-marked conflicts, and I'm sure other
> tools do.  (Probably meld, which I'm keen to try out, and which should
> be in Debian soon, presuming the ITP goes through OK.  Not knowing
> Python very well, I've not managed to get it to work.)
> 
> In terms of using existing tools, I suspect a single marked-up file is
> more convenient.  Bonus marks for creating an ediff session containing
> all the relevant files, preferably extending ediff to understand
> file-renaming and things.

This is basically exactly what I doing (Emacs + ediff + extensions).
But I won't complain if you do it first ;)

Regards,
Walter Landry
wlandry@ucsd.edu