#testcases filelog compatibility sidedata

=====================================================

Test Copy tracing for chain of copies involving merge

=====================================================

This test files covers copies/rename case for a chains of commit where merges

are involved. It cheks we do not have unwanted update of behavior and that the

different options to retrieve copies behave correctly.

Setup

=====

use git diff to see rename

  $ cat << EOF >> $HGRCPATH

  > [diff]

  > git=yes

  > [ui]

  > logtemplate={rev} {desc}\n

  > EOF

#if compatibility

  $ cat >> $HGRCPATH << EOF

  > [experimental]

  > copies.read-from = compatibility

  > EOF

#endif

#if sidedata

  $ cat >> $HGRCPATH << EOF

  > [format]

  > exp-use-side-data = yes

  > exp-use-copies-side-data-changeset = yes

  > EOF

#endif

  $ hg init repo-chain

  $ cd repo-chain

Add some linear rename initialy

  $ touch a b h

  $ hg ci -Am 'i-0 initial commit: a b h'

  adding a

  adding b

  adding h

  $ hg mv a c

  $ hg ci -Am 'i-1: a -move-> c'

  $ hg mv c d

  $ hg ci -Am 'i-2: c -move-> d'

  $ hg log -G

  @  2 i-2: c -move-> d

  |

  o  1 i-1: a -move-> c

  |

  o  0 i-0 initial commit: a b h

And having another branch with renames on the other side

  $ hg mv d e

  $ hg ci -Am 'a-1: d -move-> e'

  $ hg mv e f

  $ hg ci -Am 'a-2: e -move-> f'

  $ hg log -G --rev '::.'

  @  4 a-2: e -move-> f

  |

  o  3 a-1: d -move-> e

  |

  o  2 i-2: c -move-> d

  |

  o  1 i-1: a -move-> c

  |

  o  0 i-0 initial commit: a b h

Have a branching with nothing on one side

  $ hg up 'desc("i-2")'

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ echo foo > b

  $ hg ci -m 'b-1: b update'

  created new head

  $ hg log -G --rev '::.'

  @  5 b-1: b update

  |

  o  2 i-2: c -move-> d

  |

  o  1 i-1: a -move-> c

  |

  o  0 i-0 initial commit: a b h

Create a branch that delete a file previous renamed

  $ hg up 'desc("i-2")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg rm d

  $ hg ci -m 'c-1 delete d'

  created new head

  $ hg log -G --rev '::.'

  @  6 c-1 delete d

  |

  o  2 i-2: c -move-> d

  |

  o  1 i-1: a -move-> c

  |

  o  0 i-0 initial commit: a b h

Create a branch that delete a file previous renamed and recreate it

  $ hg up 'desc("i-2")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg rm d

  $ hg ci -m 'd-1 delete d'

  created new head

  $ echo bar > d

  $ hg add d

  $ hg ci -m 'd-2 re-add d'

  $ hg log -G --rev '::.'

  @  8 d-2 re-add d

  |

  o  7 d-1 delete d

  |

  o  2 i-2: c -move-> d

  |

  o  1 i-1: a -move-> c

  |

  o  0 i-0 initial commit: a b h

Having another branch renaming a different file to the same filename as another

  $ hg up 'desc("i-2")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg mv b g

  $ hg ci -m 'e-1 b -move-> g'

  created new head

  $ hg mv g f

  $ hg ci -m 'e-2 g -move-> f'

  $ hg log -G --rev '::.'

  @  10 e-2 g -move-> f

  |

  o  9 e-1 b -move-> g

  |

  o  2 i-2: c -move-> d

  |

  o  1 i-1: a -move-> c

  |

  o  0 i-0 initial commit: a b h

merging with unrelated change does not interfere with the renames

---------------------------------------------------------------

- rename on one side

- unrelated change on the other side

  $ hg up 'desc("b-1")'

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg merge 'desc("a-2")'

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m 'mBAm-0 simple merge - one way'

  $ hg up 'desc("a-2")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg merge 'desc("b-1")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m 'mABm-0 simple merge - the other way'

  created new head

  $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'

  @    12 mABm-0 simple merge - the other way

  |\

  +---o  11 mBAm-0 simple merge - one way

  | |/

  | o  5 b-1: b update

  | |

  o |  4 a-2: e -move-> f

  | |

  o |  3 a-1: d -move-> e

  |/

  o  2 i-2: c -move-> d

  |

  o  1 i-1: a -move-> c

  |

  o  0 i-0 initial commit: a b h

  $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")'

  A f

    d

  R d

  $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBAm")'

  A f

    d

  R d

  $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mABm")'

  M b

  $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mBAm")'

  M b

  $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mABm")'

  M b

  A f

    d

  R d

  $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBAm")'

  M b

  A f

    d

  R d

  $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mABm")'

  M b

  A f

    a

  R a

  $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBAm")'

  M b

  A f

    a

  R a

merging with the side having a delete

-------------------------------------

case summary:

- one with change to an unrelated file

- one deleting the change

and recreate an unrelated file after the merge

  $ hg up 'desc("b-1")'

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg merge 'desc("c-1")'

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m 'mBCm-0 simple merge - one way'

  $ echo bar > d

  $ hg add d

  $ hg ci -m 'mBCm-1 re-add d'

  $ hg up 'desc("c-1")'

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg merge 'desc("b-1")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m 'mCBm-0 simple merge - the other way'

  created new head

  $ echo bar > d

  $ hg add d

  $ hg ci -m 'mCBm-1 re-add d'

  $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'

  @  16 mCBm-1 re-add d

  |

  o    15 mCBm-0 simple merge - the other way

  |\

  | | o  14 mBCm-1 re-add d

  | | |

  +---o  13 mBCm-0 simple merge - one way

  | |/

  | o  6 c-1 delete d

  | |

  o |  5 b-1: b update

  |/

  o  2 i-2: c -move-> d

  |

  o  1 i-1: a -move-> c

  |

  o  0 i-0 initial commit: a b h

- comparing from the merge

  $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-0")'

  R d

  $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-0")'

  R d

  $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-0")'

  M b

  $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-0")'

  M b

  $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-0")'

  M b

  R d

  $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-0")'

  M b

  R d

  $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-0")'

  M b

  R a

  $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-0")'

  M b

  R a

- comparing with the merge children re-adding the file

  $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-1")'

  M d

  $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-1")'

  M d

  $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-1")'

  M b

  A d

  $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-1")'

  M b

  A d

  $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-1")'

  M b

  M d

  $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-1")'

  M b

  M d

  $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-1")'

  M b

  A d

  R a

  $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-1")'

  M b

  A d

  R a

Comparing with a merge re-adding the file afterward

---------------------------------------------------

Merge:

- one with change to an unrelated file

- one deleting and recreating the change

  $ hg up 'desc("b-1")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg merge 'desc("d-2")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m 'mBDm-0 simple merge - one way'

  $ hg up 'desc("d-2")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg merge 'desc("b-1")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m 'mDBm-0 simple merge - the other way'

  created new head

  $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'

  @    18 mDBm-0 simple merge - the other way

  |\

  +---o  17 mBDm-0 simple merge - one way

  | |/

  | o  8 d-2 re-add d

  | |

  | o  7 d-1 delete d

  | |

  o |  5 b-1: b update

  |/

  o  2 i-2: c -move-> d

  |

  o  1 i-1: a -move-> c

  |

  o  0 i-0 initial commit: a b h

  $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")'

  M d

  $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mDBm-0")'

  M d

  $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mBDm-0")'

  M b

  $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDBm-0")'

  M b

  $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBDm-0")'

  M b

  M d

  $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mDBm-0")'

  M b

  M d

The bugs makes recorded copy is different depending of where we started the merge from since

  $ hg manifest --debug --rev 'desc("mBDm-0")' | grep '644   d'

  b004912a8510032a0350a74daa2803dadfb00e12 644   d

  $ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644   d'

  b004912a8510032a0350a74daa2803dadfb00e12 644   d