localrepo: add setparents() to adjust dirstate copies (issue3407) The fix introduced in eab9119c5dee was only partially successful. It is correct to turn dirstate 'm' merge records into normal/dirty ones but copy records are lost in the process. To adjust them as well, we need to look in the first parent manifest to know which files were added and preserve only related records. But the dirstate does not have access to changesets, the logic has to moved at another level, in localrepo.

     1

#!/bin/bash

     2

hg init rebase

     3

cd rebase

     4

     5

#  @  7: 'H'

     6

#  |

     7

#  | o  6: 'G'

     8

#  |/|

     9

#  o |  5: 'F'

    10

#  | |

    11

#  | o  4: 'E'

    12

#  |/

    13

#  | o  3: 'D'

    14

#  | |

    15

#  | o  2: 'C'

    16

#  | |

    17

#  | o  1: 'B'

    18

#  |/

    19

#  o  0: 'A'

    20

    21

echo A > A

    22

hg ci -Am A

    23

echo B > B

    24

hg ci -Am B

    25

echo C > C

    26

hg ci -Am C

    27

echo D > D

    28

hg ci -Am D

    29

hg up -q -C 0

    30

echo E > E

    31

hg ci -Am E

    32

hg up -q -C 0

    33

echo F > F

    34

hg ci -Am F

    35

hg merge -r 4

    36

hg ci -m G

    37

hg up -q -C 5

    38

echo H > H

    39

hg ci -Am H

    40

    41

hg bundle -a ../rebase.hg

    42

    43

cd ..

    44

rm -Rf rebase