Mercurial development workflow

[Martin Geisler]

Thomas Arendsen Hein <thomas at intevation.de> writes:

> * Martin Geisler <mgeisler at mgeisler.net> [20070729 19:06]:
>
>> [...] I understand that one has to do it the other way around: fix
>> the bug on the oldest stable release and merge the fix into the
>> newer releases.
>
> While usually all fixes go to -stable, sometimes there are
> exceptions. Then we use the transplant extension (which basically
> does hg export and import) to apply the fix to the stable tree,
> immediately followed by pulling crew-stable into crew and merging.
>
> 3-way-merge will detect that the changes coming in via -stable are
> already present in crew and so won't apply them again. [...]

Thanks for the tip about the transplant extension, its good to know
that there are ways to fix things if one commits on the wrong tree.

In general I must say that I have been pleasantly surprised by how one
can undo some things with hg, it is very useful!

I've already used the 'hg rollback' command a couple of times to
correct typos in commit messages or to add files that I missed in the
first commit (exactly the kind of situation described in Chapter 9 of
the excellent book by Bryan O'Sullivan).

-- 
Martin Geisler  ---  <mgeisler at mgeisler.net>  ---  http://mgeisler.net
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial/attachments/20070731/8cac78f8/attachment.pgp