##// END OF EJS Templates
mergemod: drop support for merge.update without a target...
Augie Fackler -
r30486:d6f3877b default
parent child Browse files
Show More
@@ -25,7 +25,6 b' from .node import ('
25 )
25 )
26 from . import (
26 from . import (
27 copies,
27 copies,
28 destutil,
29 error,
28 error,
30 filemerge,
29 filemerge,
31 obsolete,
30 obsolete,
@@ -1484,11 +1483,6 b' def update(repo, node, branchmerge, forc'
1484 if ancestor is not None:
1483 if ancestor is not None:
1485 pas = [repo[ancestor]]
1484 pas = [repo[ancestor]]
1486
1485
1487 if node is None:
1488 repo.ui.deprecwarn('update with no target', '3.9')
1489 rev, _mark, _act = destutil.destupdate(repo)
1490 node = repo[rev].node()
1491
1492 overwrite = force and not branchmerge
1486 overwrite = force and not branchmerge
1493
1487
1494 p2 = repo[node]
1488 p2 = repo[node]
General Comments 0
You need to be logged in to leave comments. Login now