Show More
@@ -1506,7 +1506,9 b' class localrepository:' | |||||
1506 | m, o, flag = merge[f] |
|
1506 | m, o, flag = merge[f] | |
1507 | self.merge3(f, m, o) |
|
1507 | self.merge3(f, m, o) | |
1508 | util.set_exec(self.wjoin(f), flag) |
|
1508 | util.set_exec(self.wjoin(f), flag) | |
1509 | if moddirstate: |
|
1509 | if moddirstate and mode == 'm': | |
|
1510 | # only update dirstate on branch merge, otherwise we | |||
|
1511 | # could mark files with changes as unchanged | |||
1510 | self.dirstate.update([f], mode) |
|
1512 | self.dirstate.update([f], mode) | |
1511 |
|
1513 | |||
1512 | remove.sort() |
|
1514 | remove.sort() |
General Comments 0
You need to be logged in to leave comments.
Login now