mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
Merge with crew-stable
This commit is contained in:
commit
eeff34ef5f
@ -357,7 +357,7 @@ class patchfile:
|
|||||||
|
|
||||||
if len(cand) > 1:
|
if len(cand) > 1:
|
||||||
# resort our list of potentials forward then back.
|
# resort our list of potentials forward then back.
|
||||||
cand.sort(cmp=sorter)
|
cand.sort(sorter)
|
||||||
return cand
|
return cand
|
||||||
|
|
||||||
def hashlines(self):
|
def hashlines(self):
|
||||||
|
@ -129,3 +129,27 @@ echo "% committer should be 'someoneelse'"
|
|||||||
hg --cwd b tip | grep someoneelse
|
hg --cwd b tip | grep someoneelse
|
||||||
echo "% should be empty"
|
echo "% should be empty"
|
||||||
hg --cwd b status
|
hg --cwd b status
|
||||||
|
|
||||||
|
|
||||||
|
# Test fuzziness (ambiguous patch location, fuzz=2)
|
||||||
|
echo % test fuzziness
|
||||||
|
hg init fuzzy
|
||||||
|
cd fuzzy
|
||||||
|
echo line1 > a
|
||||||
|
echo line0 >> a
|
||||||
|
echo line3 >> a
|
||||||
|
hg ci -Am adda
|
||||||
|
echo line1 > a
|
||||||
|
echo line2 >> a
|
||||||
|
echo line0 >> a
|
||||||
|
echo line3 >> a
|
||||||
|
hg ci -m change a
|
||||||
|
hg export tip > tip.patch
|
||||||
|
hg up -C 0
|
||||||
|
echo line1 > a
|
||||||
|
echo line0 >> a
|
||||||
|
echo line1 >> a
|
||||||
|
echo line0 >> a
|
||||||
|
hg ci -m brancha
|
||||||
|
hg import -v tip.patch
|
||||||
|
cd ..
|
||||||
|
@ -125,3 +125,10 @@ summary: subdir change
|
|||||||
% committer should be 'someoneelse'
|
% committer should be 'someoneelse'
|
||||||
user: someoneelse
|
user: someoneelse
|
||||||
% should be empty
|
% should be empty
|
||||||
|
% test fuzziness
|
||||||
|
adding a
|
||||||
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||||
|
applying tip.patch
|
||||||
|
patching file a
|
||||||
|
Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines).
|
||||||
|
a
|
||||||
|
Loading…
Reference in New Issue
Block a user