Talk:Mercurial vs. Subversion
From APIDesign
(Answering Jaroslav's interrogation about rebase) |
|||
| (3 intermediate revisions not shown.) | |||
| Line 2: | Line 2: | ||
Not exactly. Mercurial would record the two changes as separate heads (implicit branches). And, by default, it would not allow pushing both to a central repo without a prior merge. But this is just a default. What typically bothers people is they need to merge the two heads to combine their effects. Which is, again, correct, but may seem to clutter history. So you can rebase, if you prefer, explicitly emulating what svn implicitly does. | Not exactly. Mercurial would record the two changes as separate heads (implicit branches). And, by default, it would not allow pushing both to a central repo without a prior merge. But this is just a default. What typically bothers people is they need to merge the two heads to combine their effects. Which is, again, correct, but may seem to clutter history. So you can rebase, if you prefer, explicitly emulating what svn implicitly does. | ||
| - | |||
| - | + | --parren | |
| - | < | + | Interesting note. Thanks. I copied it to [[Mercurial vs. Subversion|main page]]. Feel free to edit it there. One question through. What you mean by ''rebase''? I only found [[Git]]'s rebase, but nothing for [[Mercurial]]. I know I can do: |
| + | |||
| + | <source lang="bash"> | ||
# with some local changes | # with some local changes | ||
hg pull -u | hg pull -u | ||
hg ci -m "..." | hg ci -m "..." | ||
hg push | hg push | ||
| - | </ | + | </source> |
and effectively do ''rebase'' before single commit. Or, in case I've already integrated my commit I can: | and effectively do ''rebase'' before single commit. Or, in case I've already integrated my commit I can: | ||
| - | < | + | <source lang="bash"> |
hg push # fails and I do not want 2nd head | hg push # fails and I do not want 2nd head | ||
hg rollback | hg rollback | ||
| Line 20: | Line 21: | ||
hg ci -m "..." | hg ci -m "..." | ||
hg push | hg push | ||
| - | </ | + | </source> |
| + | |||
| + | But how exactly do ''rebase'' for multiple commits is not really clear to me. Maybe with ''hg strip''? But this is getting complex, no [[cluelessness]] at all. | ||
| + | |||
| + | --[[User:JaroslavTulach|JaroslavTulach]] 04:37, 10 April 2009 (UTC) | ||
| - | + | :[http://mercurial.selenic.com/wiki/RebaseExtension rebase] is a Mercurial command. It is shipped as an official extension and needs to be explicitely activated in your hgrc, as it rewrites history. | |
| + | <source lang="ini"> | ||
| + | [extensions] | ||
| + | rebase = | ||
| + | </source> | ||
| + | : --cedric | ||
Current revision
<quote>Mercurial would refuse such integration asking the user A to svn update to latest version of the repository first. This is the correct behaviour. However it is not really clueless.</quote>
Not exactly. Mercurial would record the two changes as separate heads (implicit branches). And, by default, it would not allow pushing both to a central repo without a prior merge. But this is just a default. What typically bothers people is they need to merge the two heads to combine their effects. Which is, again, correct, but may seem to clutter history. So you can rebase, if you prefer, explicitly emulating what svn implicitly does.
--parren
Interesting note. Thanks. I copied it to main page. Feel free to edit it there. One question through. What you mean by rebase? I only found Git's rebase, but nothing for Mercurial. I know I can do:
# with some local changes hg pull -u hg ci -m "..." hg push
and effectively do rebase before single commit. Or, in case I've already integrated my commit I can:
hg push # fails and I do not want 2nd head hg rollback hg pull -u hg ci -m "..." hg push
But how exactly do rebase for multiple commits is not really clear to me. Maybe with hg strip? But this is getting complex, no cluelessness at all.
--JaroslavTulach 04:37, 10 April 2009 (UTC)
- rebase is a Mercurial command. It is shipped as an official extension and needs to be explicitely activated in your hgrc, as it rewrites history.
[extensions] rebase =
- --cedric
Follow
