[Python-Dev] Useful page in the Hg book

[Jesus Cea]

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

On 17/03/11 02:39, Nick Coghlan wrote:
> On Wed, Mar 16, 2011 at 7:09 PM, Nick Coghlan <ncoghlan at gmail.com> wrote:
>> As I'm sure there will be plenty of erring as we get used to Hg:
>> http://hgbook.red-bean.com/read/finding-and-fixing-mistakes.html
>>
>> For simple cases of attempting to push a single commit that gets
>> rejected by the server, hg rollback/hg pull/hg commit/hg push/ may
>> provide a cleaner history than doing a dummy merge.
> 
> Having tried this, I advise against anyone else trying it. I seem to
> have got my local repo into a state where it thinks I have already
> merged something from 3.2 to default when I really haven't.

The good thing about dummy merges is that you do the merge in your local
clone, and if you don't like it you can do a revert or a rollback. That
way, it is risk free and you can experiment locally before pushing.

Since rebase is in HG core these days, I am getting comfy with "hg pull
- --rebase". But I find rewriting history too scary when merging between
branches and complicated changeset graphs. I want to be able to drop a
bad conflict merging and try again, in a safe way.

- -- 
Jesus Cea Avion                         _/_/      _/_/_/        _/_/_/
jcea at jcea.es - http://www.jcea.es/     _/_/    _/_/  _/_/    _/_/  _/_/
jabber / xmpp:jcea at jabber.org         _/_/    _/_/          _/_/_/_/_/
.                              _/_/  _/_/    _/_/          _/_/  _/_/
"Things are not so easy"      _/_/  _/_/    _/_/  _/_/    _/_/  _/_/
"My name is Dump, Core Dump"   _/_/_/        _/_/_/      _/_/  _/_/
"El amor es poner tu felicidad en la felicidad de otro" - Leibniz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQCVAwUBTYGBMJlgi5GaxT1NAQIl2wQAllNQiQfjHygDDoGEGm+9wUAxtaGLvSkB
na/MmFTgXSXn4og7K5JVmTesc1KXHJjF+a3Kb2oDu9A3IRbjipEIc4qWpnwTlPBW
skmAMXhwLR+Y9y+nXo2ry9R71SvIa7u1RGihrPWBnnIHzlgWKPwr93BPdYygSb4g
uQJ4QGIVudU=
=LSJh
-----END PGP SIGNATURE-----