Show More
@@ -90,9 +90,7 b' def update(repo, node, branchmerge=False' | |||||
90 | if not force: |
|
90 | if not force: | |
91 | for f in unknown: |
|
91 | for f in unknown: | |
92 | if f in m2: |
|
92 | if f in m2: | |
93 |
|
|
93 | if repo.file(f).cmp(m2[f], repo.wread(f)): | |
94 | t2 = repo.file(f).read(m2[f]) |
|
|||
95 | if cmp(t1, t2) != 0: |
|
|||
96 | raise util.Abort(_("'%s' already exists in the working" |
|
94 | raise util.Abort(_("'%s' already exists in the working" | |
97 | " dir and differs from remote") % f) |
|
95 | " dir and differs from remote") % f) | |
98 |
|
96 | |||
@@ -137,11 +135,8 b' def update(repo, node, branchmerge=False' | |||||
137 |
|
135 | |||
138 | # is the wfile new since m1, and match m2? |
|
136 | # is the wfile new since m1, and match m2? | |
139 | if f not in m1: |
|
137 | if f not in m1: | |
140 |
|
|
138 | if not repo.file(f).cmp(m2[f], repo.wread(f)): | |
141 | t2 = repo.file(f).read(m2[f]) |
|
|||
142 | if cmp(t1, t2) == 0: |
|
|||
143 | n = m2[f] |
|
139 | n = m2[f] | |
144 | del t1, t2 |
|
|||
145 |
|
140 | |||
146 | # are files different? |
|
141 | # are files different? | |
147 | if n != m2[f]: |
|
142 | if n != m2[f]: |
General Comments 0
You need to be logged in to leave comments.
Login now