Show More
@@ -1108,10 +1108,12 b' class localrepository:' | |||||
1108 | self.ui.debug("other deleted %s\n" % f) |
|
1108 | self.ui.debug("other deleted %s\n" % f) | |
1109 | remove.append(f) # other deleted it |
|
1109 | remove.append(f) # other deleted it | |
1110 | else: |
|
1110 | else: | |
1111 | # file is not in ancestor or target |
|
1111 | if n == m1.get(f, nullid): # same as parent | |
1112 | if n == m1.get(f, nullid) or force: # same as parent |
|
1112 | if p2 == pa: # going backwards? | |
1113 | self.ui.debug("remote deleted %s\n" % f) |
|
1113 | self.ui.debug("remote deleted %s\n" % f) | |
1114 | remove.append(f) |
|
1114 | remove.append(f) | |
|
1115 | else: | |||
|
1116 | self.ui.debug("local created %s, keeping\n" % f) | |||
1115 | else: |
|
1117 | else: | |
1116 | self.ui.debug("working dir created %s, keeping\n" % f) |
|
1118 | self.ui.debug("working dir created %s, keeping\n" % f) | |
1117 |
|
1119 |
@@ -16,5 +16,6 b' user: test' | |||||
16 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
16 | date: Thu Jan 1 00:00:00 1970 +0000 | |
17 | summary: test |
|
17 | summary: test | |
18 |
|
18 | |||
19 |
abort: working copy of .hgtags is changed |
|
19 | abort: working copy of .hgtags is changed! | |
|
20 | (please commit .hgtags manually) | |||
20 | failed |
|
21 | failed |
General Comments 0
You need to be logged in to leave comments.
Login now