Show More
@@ -1796,6 +1796,7 b' def mergeupdate(orig, repo, node, branch' | |||||
1796 | raise error.ProgrammingError( |
|
1796 | raise error.ProgrammingError( | |
1797 | b'largefiles is not compatible with in-memory merge' |
|
1797 | b'largefiles is not compatible with in-memory merge' | |
1798 | ) |
|
1798 | ) | |
|
1799 | with lfdirstate.parentchange(): | |||
1799 | result = orig(repo, node, branchmerge, force, *args, **kwargs) |
|
1800 | result = orig(repo, node, branchmerge, force, *args, **kwargs) | |
1800 |
|
1801 | |||
1801 | newstandins = lfutil.getstandinsstate(repo) |
|
1802 | newstandins = lfutil.getstandinsstate(repo) |
General Comments 0
You need to be logged in to leave comments.
Login now