936 

   937   $ cd ..

   938 

   939 .hgtags fnode should be properly resolved at merge revision (issue6673)

   940 

   941   $ hg init issue6673

   942   $ cd issue6673

   943 

   944   $ touch a

   945   $ hg ci -qAm a

   946   $ hg branch -q stable

   947   $ hg ci -m branch

   948 

   949   $ hg up -q default

   950   $ hg merge -q stable

   951   $ hg ci -m merge

   952 

   953  add tag to stable branch:

   954 

   955   $ hg up -q stable

   956   $ echo a >> a

   957   $ hg ci -m a

   958   $ hg tag whatever

   959   $ hg log -GT'{rev} {tags}\n'

   960   @  4 tip

   961   |

   962   o  3 whatever

   963   |

   964   | o  2

   965   |/|

   966   o |  1

   967   |/

   968   o  0

   969   

   970 

   971  merge tagged stable into default:

   972 

   973   $ hg up -q default

   974   $ hg merge -q  stable

   975   $ hg ci -m merge

   976   $ hg log -GT'{rev} {tags}\n'

   977   @    5 tip

   978   |\

   979   | o  4

   980   | |

   981   | o  3 whatever

   982   | |

   983   o |  2

   984   |\|

   985   | o  1

   986   |/

   987   o  0

   988   

   989 

   990   $ cd ..