Rebase extension behaviour

[Stefano Tortarolo]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Guido Ostkamp wrote:
> Hello,
> 
> [I posted the following a few days ago on mercurial list, but there was
> no response, thus I retry it once to development list as well as
> directly to the author of the Rebase extension]

First of all, sorry for replying so late, but I'm very busy in this
period and I can hardly skim through my personal inbox...

> I played a bit with the new 'rebase' extension (hg version version
> a04d8cadb6af) and came along the following strange behaviour:
[cut]
> Now I want to rebase 'branch1' on top of 'default' without loosing the
> branches.
> 
> If I try
> 
> $ hg rebase -d default

There's nothing strange in this behaviour...

$ hg log -b default -q
2:867212547d0b
1:8b468c5ee74e
0:29190a70aa39

$ hg log -b branch1 -q
3:29b4ec5f2dc3

rebase -d default "clones" changesets (in this case rev 3:29b4ec5f2dc3)
from branch1 to default and deletes them (unless you use --keep), thus
removing branch1.

In git, on the other hand, you have:
$ git log master | grep commit
commit 017708ffafbe4da7d30e01456a1ee1fcbb0857fd
    commit 2
commit 1c3b5da0ab77fdb5c76bb3309e0ae77b5cc3f78c
    commit 1
commit 730d34d30abba9e6ab3a4d7a8fc511cb7ca17443
    commit 0

$ git log branch1 | grep commit
commit 8a27bc05d47aaa5f4b1d1fcde3ece0f869da955a
    commit 1a
commit 1c3b5da0ab77fdb5c76bb3309e0ae77b5cc3f78c
    commit 1
commit 730d34d30abba9e6ab3a4d7a8fc511cb7ca17443
    commit 0

I'm not a git expert, but it seems to me that git handles branches in a
very different way.

If there's someone with a stronger git knowledge please speak up.

I apologize again for replying so late.

Cheers,
Stefano
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIwRzLXJVex8JRMXgRArHyAJ4ooh2kSxuJP9Ba7viQrY8tJ5rz9wCgt55C
pePLcmggZMPMZ4iN7JGspII=
=X7Ob
-----END PGP SIGNATURE-----