This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8036

tests: stablize test-rename-merge1.t on Windows
ClosedPublic

Authored by mharbison72 on Jan 28 2020, 10:12 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG5de70f798ea7: tests: stablize test-rename-merge1.t on Windows
Summary

This goes with d7622fdec3b5.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Jan 28 2020, 10:12 PM
martinvonz accepted this revision.Jan 29 2020, 12:10 AM
This revision is now accepted and ready to land.Jan 29 2020, 12:10 AM
mharbison72 added a commit: rHG5de70f798ea7: tests: stablize test-rename-merge1.t on Windows.Jan 29 2020, 12:23 AM
Closed by commit rHG5de70f798ea7: tests: stablize test-rename-merge1.t on Windows (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rename-merge1.t (1 line)

Diff 19673

tests/test-rename-merge1.t

all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'x' -> dst: 'z' src: 'x' -> dst: 'z'
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508 ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
preserving x for resolve of x preserving x for resolve of x
preserving z for resolve of z preserving z for resolve of z
starting 4 threads for background file closing (?)
x: prompt changed/deleted -> m (premerge) x: prompt changed/deleted -> m (premerge)
picked tool ':prompt' for x (binary False symlink False changedelete True) picked tool ':prompt' for x (binary False symlink False changedelete True)
file 'x' was deleted in other [merge rev] but was modified in local [working copy]. file 'x' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved. You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
y: prompt deleted/changed -> m (premerge) y: prompt deleted/changed -> m (premerge)
picked tool ':prompt' for y (binary False symlink False changedelete True) picked tool ':prompt' for y (binary False symlink False changedelete True)
file 'y' was deleted in local [working copy] but was modified in other [merge rev]. file 'y' was deleted in local [working copy] but was modified in other [merge rev].