[SoC] Rebase feature - Introduction
Stefano Tortarolo
stefano.tortarolo at gmail.com
Mon May 26 09:09:00 CDT 2008
Hi,
I've been working on my SoC project for some time and now I'm ready to
show you something...
I'm also writing a paper to describe what my project consists in. I
think it can be useful to create a common field between me and you.
Currently it's available a very first prototype that can handle very
simple situations, but can't handle complex ones described in the paper
nor user interruption/restore.
Actually, if you try to rebase on the same branch it recognizes that
situation, but it won't allow you to do that.
Conflicting merges are not yet well handled, but if you set a mergetool
in your .hgrc it should be launched correctly, you can solve the
conflict and then the process goes on.
Play with it, but remember that it's just a prototype...
The paper is available here: http://tinyurl.com/4uvebu
while the code is here: http://freehg.org/u/astratto/soc/
Any suggestions will be very appreciated.
Thank you
Stefano Tortarolo
More information about the Mercurial-devel
mailing list