equal
deleted
inserted
replaced
107 """ |
107 """ |
108 # avoid silly behavior for update from empty dir |
108 # avoid silly behavior for update from empty dir |
109 if not c1 or not c2 or c1 == c2: |
109 if not c1 or not c2 or c1 == c2: |
110 return {}, {} |
110 return {}, {} |
111 |
111 |
|
112 # avoid silly behavior for parent -> working dir |
|
113 if c2.node() == None and c1.node() == repo.dirstate.parents()[0]: |
|
114 return repo.dirstate.copies(), {} |
|
115 |
112 limit = _findlimit(repo, c1.rev(), c2.rev()) |
116 limit = _findlimit(repo, c1.rev(), c2.rev()) |
113 m1 = c1.manifest() |
117 m1 = c1.manifest() |
114 m2 = c2.manifest() |
118 m2 = c2.manifest() |
115 ma = ca.manifest() |
119 ma = ca.manifest() |
116 |
120 |