Mercurial > hg
comparison tests/test-keyword.t @ 17811:a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Obsolescence cycle are bad and should be avoided as much as possible. The
current amend implemented touch changeset meta data as few as possible. This
make is easy for amend to result in the same node than a precursors. We add some
deterministic noise in extra to avoid this. In practice, the hex of the amended
changeset is stored in 'amend_source' extra key.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Thu, 18 Oct 2012 22:12:15 +0200 |
parents | 31f32a96e1e3 |
children | db25bf1dc828 |
comparison
equal
deleted
inserted
replaced
17810:2894d180afa1 | 17811:a8aba2921456 |
---|---|
507 $ hg -q commit -d '14 1' -m 'prepare amend' | 507 $ hg -q commit -d '14 1' -m 'prepare amend' |
508 | 508 |
509 $ hg --debug commit --amend -d '15 1' -m 'amend without changes' | grep keywords | 509 $ hg --debug commit --amend -d '15 1' -m 'amend without changes' | grep keywords |
510 overwriting a expanding keywords | 510 overwriting a expanding keywords |
511 $ hg -q id | 511 $ hg -q id |
512 577e60613a88 | 512 67d8c481a6be |
513 $ head -1 a | 513 $ head -1 a |
514 expand $Id: a,v 577e60613a88 1970/01/01 00:00:15 test $ | 514 expand $Id: a,v 67d8c481a6be 1970/01/01 00:00:15 test $ |
515 | 515 |
516 $ hg -q strip -n tip | 516 $ hg -q strip -n tip |
517 | 517 |
518 Test patch queue repo | 518 Test patch queue repo |
519 | 519 |