transpant and keywords together

Christian Ebert blacktrash at gmx.net
Tue Dec 22 14:00:56 CST 2009


* Berkes Adam on Tuesday, December 22, 2009 at 19:03:27 +0100
> It is 100% reproducable, I've tried a small scenario:

Thank you very much for the example! It can be reduced to steps
8-10.

>  1. turned on keyword extension in ~/.hgrc
>  2. hg update null
>  3. hg update -r xxx /* $Id$ correctly expanded, I had checked)
>  4. Do a change on a file with $Id$, commit the change (keywords updated)
>  5. hg push /* I have a clone and a second clone from it for branch */
>  6. cd ../main /* change to other clone */
>  7. hg update null

up to here not needed to reproduce, but thanks for taking the
trouble.

>  8. hg update -r default
>  9. hg -y transplant --config extensions.hgext.transplant= --log
>     --branch xxx 7ea8b487db0c8ae761435115a48e11d7198c9592
> 10. hg status shows difference for the changed file on keywords part

hg tip -p also shows an expanded keyword in the changeset which
shouldn't happen of course.

This only happens with "hg transplant --branch", not with
--source.

I will try and look into it, although I can't promise anything
soon, as Xmas stress is building up ;-) Let's hope we can avoid
the worst case that keyword and transplant can't be used
together.

But thanks again for persisting.

c
-- 
\black\trash movie    _C O W B O Y_  _C A N O E_  _C O M A_
                     Ein deutscher Western/A German Western

         --->> http://www.blacktrash.org/underdogma/ccc.php


More information about the Mercurial-devel mailing list