@@ -569,6 +569,33 @@ it.layer(layerTest)("CheckpointStore.layer", (it) => {
569569 yield * git ( upstream , [ "branch" , "other" , "agent" ] ) ;
570570 yield * git ( tmp , [ "fetch" , "upstream" ] , { committedAt : afterCheckpoint } ) ;
571571 expect ( yield * checkpointStore . listAuthoredPaths ( refs ) ) . toEqual ( new Set ( [ "own.txt" ] ) ) ;
572+
573+ yield * writeTextFile ( NodePath . join ( tmp , "upstream.txt" ) , "local\n" ) ;
574+ yield * git ( tmp , [ "add" , "." ] ) ;
575+ yield * git ( tmp , [ "commit" , "-m" , "local conflict" ] , { committedAt : afterCheckpoint } ) ;
576+ yield * writeTextFile ( NodePath . join ( upstream , "upstream.txt" ) , "remote\n" ) ;
577+ yield * git ( upstream , [ "add" , "." ] ) ;
578+ yield * git ( upstream , [ "commit" , "-m" , "remote conflict" ] , { committedAt : afterCheckpoint } ) ;
579+ yield * git ( tmp , [ "fetch" , "upstream" ] , { committedAt : afterCheckpoint } ) ;
580+ yield * git ( tmp , [ "rebase" , `upstream/${ branch } ` ] , {
581+ committedAt : afterCheckpoint ,
582+ allowNonZeroExit : true ,
583+ } ) ;
584+ expect ( yield * git ( tmp , [ "diff" , "--name-only" , "--diff-filter=U" ] ) ) . toBe ( "upstream.txt" ) ;
585+ yield * writeTextFile ( NodePath . join ( tmp , "upstream.txt" ) , "resolved\n" ) ;
586+ yield * git ( tmp , [ "add" , "upstream.txt" ] ) ;
587+ yield * git ( tmp , [ "-c" , "core.editor=true" , "rebase" , "--continue" ] , {
588+ committedAt : afterCheckpoint ,
589+ } ) ;
590+ yield * git ( tmp , [ "push" , "upstream" , "HEAD:refs/heads/resolved" ] , {
591+ committedAt : afterCheckpoint ,
592+ } ) ;
593+ yield * git ( upstream , [ "branch" , "rediscovered" , "resolved" ] ) ;
594+ yield * git ( tmp , [ "fetch" , "upstream" ] , { committedAt : afterCheckpoint } ) ;
595+ yield * checkpointStore . captureCheckpoint ( { cwd : tmp , checkpointRef : refs . toCheckpointRef } ) ;
596+ expect ( yield * checkpointStore . listAuthoredPaths ( refs ) ) . toEqual (
597+ new Set ( [ "own.txt" , "upstream.txt" ] ) ,
598+ ) ;
572599 } ) ,
573600 ) ;
574601
0 commit comments