Mercurial > hg
comparison mercurial/mergestate.py @ 51700:7f0cb9ee0534
Backout accidental publication of a large range of revisions
I accidentally published 25e7f9dcad0f::bd1483fd7088, this is the inverse.
| author | Raphaël Gomès <rgomes@octobus.net> |
|---|---|
| date | Tue, 23 Jul 2024 10:02:46 +0200 |
| parents | 493034cc3265 |
| children | ca7bde5dbafb |
comparison
equal
deleted
inserted
replaced
| 51699:bd1483fd7088 | 51700:7f0cb9ee0534 |
|---|---|
| 493 actions[action].append((f, None, b"merge result")) | 493 actions[action].append((f, None, b"merge result")) |
| 494 return actions | 494 return actions |
| 495 | 495 |
| 496 | 496 |
| 497 class mergestate(_mergestate_base): | 497 class mergestate(_mergestate_base): |
| 498 | |
| 498 statepathv1 = b'merge/state' | 499 statepathv1 = b'merge/state' |
| 499 statepathv2 = b'merge/state2' | 500 statepathv2 = b'merge/state2' |
| 500 | 501 |
| 501 @staticmethod | 502 @staticmethod |
| 502 def clean(repo): | 503 def clean(repo): |