diff options
Diffstat (limited to 'tests/test-merge-types.t')
| -rw-r--r-- | tests/test-merge-types.t | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/tests/test-merge-types.t b/tests/test-merge-types.t index c51a029..e328399 100644 --- a/tests/test-merge-types.t +++ b/tests/test-merge-types.t @@ -1,5 +1,3 @@ - $ "$TESTDIR/hghave" symlink execbit || exit 80 - $ hg init $ echo a > a @@ -19,8 +17,8 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c + overwrite None partial False + ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: update permissions -> e @@ -47,8 +45,8 @@ Symlink is local parent, executable is other: $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f + overwrite None partial False + ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: remote is newer -> g @@ -70,41 +68,3 @@ Symlink is other parent, executable is local: > fi a has no flags (default for conflicts) -Update to link without local change should get us a symlink (issue3316): - - $ hg up -C 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg up - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg st - -Update to link with local change should cause a merge prompt (issue3200): - - $ hg up -C 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo data > a - $ HGMERGE= hg up -y --debug - searching for copies back to rev 2 - resolving manifests - overwrite: False, partial: False - ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f - a: versions differ -> m - preserving a for resolve of a - updating: a 1/1 files (100.00%) - (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) - picked tool 'internal:prompt' for a (binary False symlink True) - no tool found to merge a - keep (l)ocal or take (o)ther? l - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - $ hg diff --git - diff --git a/a b/a - old mode 120000 - new mode 100644 - --- a/a - +++ b/a - @@ -1,1 +1,1 @@ - -symlink - \ No newline at end of file - +data - - |