Show More
@@ -2010,7 +2010,9 b' class queue(object):' | |||||
2010 | # be removed. Treat this as a simple add. |
|
2010 | # be removed. Treat this as a simple add. | |
2011 | if src is not None and src in repo.dirstate: |
|
2011 | if src is not None and src in repo.dirstate: | |
2012 | copies.setdefault(src, []).append(dst) |
|
2012 | copies.setdefault(src, []).append(dst) | |
2013 |
repo.dirstate. |
|
2013 | repo.dirstate.update_file( | |
|
2014 | dst, p1_tracked=False, wc_tracked=True | |||
|
2015 | ) | |||
2014 | # remember the copies between patchparent and qtip |
|
2016 | # remember the copies between patchparent and qtip | |
2015 | for dst in aaa: |
|
2017 | for dst in aaa: | |
2016 | src = ctx[dst].copysource() |
|
2018 | src = ctx[dst].copysource() | |
@@ -2028,7 +2030,9 b' class queue(object):' | |||||
2028 | repo.dirstate.copy(src, dst) |
|
2030 | repo.dirstate.copy(src, dst) | |
2029 | else: |
|
2031 | else: | |
2030 | for dst in a: |
|
2032 | for dst in a: | |
2031 |
repo.dirstate. |
|
2033 | repo.dirstate.update_file( | |
|
2034 | dst, p1_tracked=False, wc_tracked=True | |||
|
2035 | ) | |||
2032 | # Drop useless copy information |
|
2036 | # Drop useless copy information | |
2033 | for f in list(repo.dirstate.copies()): |
|
2037 | for f in list(repo.dirstate.copies()): | |
2034 | repo.dirstate.copy(None, f) |
|
2038 | repo.dirstate.copy(None, f) |
General Comments 0
You need to be logged in to leave comments.
Login now