Show More
@@ -1700,7 +1700,10 b' def addpartbundlestream2(bundler, repo, ' | |||||
1700 | includeobsmarkers = False |
|
1700 | includeobsmarkers = False | |
1701 | if repo.obsstore: |
|
1701 | if repo.obsstore: | |
1702 | remoteversions = obsmarkersversion(bundler.capabilities) |
|
1702 | remoteversions = obsmarkersversion(bundler.capabilities) | |
1703 |
if |
|
1703 | if not remoteversions: | |
|
1704 | raise error.Abort(_('server has obsolescence markers, but client ' | |||
|
1705 | 'cannot receive them via stream clone')) | |||
|
1706 | elif repo.obsstore._version in remoteversions: | |||
1704 | includeobsmarkers = True |
|
1707 | includeobsmarkers = True | |
1705 |
|
1708 | |||
1706 | filecount, bytecount, it = streamclone.generatev2(repo, includepats, |
|
1709 | filecount, bytecount, it = streamclone.generatev2(repo, includepats, |
@@ -556,6 +556,12 b' Clone non-publishing with obsolescence' | |||||
556 | $ hg debugobsolete -R with-obsolescence |
|
556 | $ hg debugobsolete -R with-obsolescence | |
557 | 50382b884f66690b7045cac93a540cba4d4c906f 0 {c17445101a72edac06facd130d14808dfbd5c7c2} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
557 | 50382b884f66690b7045cac93a540cba4d4c906f 0 {c17445101a72edac06facd130d14808dfbd5c7c2} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
558 |
|
558 | |||
|
559 | $ hg clone -U --stream --config experimental.evolution=0 http://localhost:$HGPORT with-obsolescence-no-evolution | |||
|
560 | streaming all changes | |||
|
561 | remote: abort: server has obsolescence markers, but client cannot receive them via stream clone | |||
|
562 | abort: pull failed on remote | |||
|
563 | [255] | |||
|
564 | ||||
559 |
$ |
|
565 | $ killdaemons.py | |
560 |
|
566 | |||
561 | #endif |
|
567 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now