Show More
@@ -1253,7 +1253,7 b' class localrepository:' | |||||
1253 | pl = self.dirstate.parents() |
|
1253 | pl = self.dirstate.parents() | |
1254 | if not force and pl[1] != nullid: |
|
1254 | if not force and pl[1] != nullid: | |
1255 | self.ui.warn("aborting: outstanding uncommitted merges\n") |
|
1255 | self.ui.warn("aborting: outstanding uncommitted merges\n") | |
1256 | return |
|
1256 | return 1 | |
1257 |
|
1257 | |||
1258 | p1, p2 = pl[0], node |
|
1258 | p1, p2 = pl[0], node | |
1259 | pa = self.changelog.ancestor(p1, p2) |
|
1259 | pa = self.changelog.ancestor(p1, p2) | |
@@ -1407,7 +1407,7 b' class localrepository:' | |||||
1407 | get[f] = merge[f][1] |
|
1407 | get[f] = merge[f][1] | |
1408 | merge = {} |
|
1408 | merge = {} | |
1409 |
|
1409 | |||
1410 | if linear_path: |
|
1410 | if linear_path or force: | |
1411 | # we don't need to do any magic, just jump to the new rev |
|
1411 | # we don't need to do any magic, just jump to the new rev | |
1412 | mode = 'n' |
|
1412 | mode = 'n' | |
1413 | p1, p2 = p2, nullid |
|
1413 | p1, p2 = p2, nullid | |
@@ -1464,7 +1464,10 b' class localrepository:' | |||||
1464 | remove.sort() |
|
1464 | remove.sort() | |
1465 | for f in remove: |
|
1465 | for f in remove: | |
1466 | self.ui.note("removing %s\n" % f) |
|
1466 | self.ui.note("removing %s\n" % f) | |
|
1467 | try: | |||
1467 | os.unlink(f) |
|
1468 | os.unlink(f) | |
|
1469 | except OSError, inst: | |||
|
1470 | self.ui.warn("update failed to remove %s: %s!\n" % (f, inst)) | |||
1468 | # try removing directories that might now be empty |
|
1471 | # try removing directories that might now be empty | |
1469 | try: os.removedirs(os.path.dirname(f)) |
|
1472 | try: os.removedirs(os.path.dirname(f)) | |
1470 | except: pass |
|
1473 | except: pass |
General Comments 0
You need to be logged in to leave comments.
Login now