comparison tests/test-evolve-content-divergent-user-independent-resolution.t @ 6316:b1d1f4ade142

evolve: don't embed graft data when completing interrupted evolve operations This data shows in TortoiseHg, and is a bit awkward since it wasn't added before in the non interrupted case. It originated before 823031b51d81, when the implementation changed away from using the graft command. According to @marmoute, unconditionally adding `source` served as noise to create a new hash and prevent a cycle, so use the same key (`rebase_source`) as would happen in the uninterrupted case (as demonstrated by the first change in test-stabilize-conflict.t).
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 07 Oct 2022 18:14:58 -0400
parents 5e14782908e4
children bd2c42680dff
comparison
equal deleted inserted replaced
6314:3bad2060db25 6316:b1d1f4ade142