##// END OF EJS Templates
hg merge: fix time asymmetry bug with deleting files on update to past...
mpm@selenic.com -
r383:4862a134 default
parent child Browse files
Show More
@@ -0,0 +1,12 b''
1 #!/bin/sh -x
2 hg init
3 echo This is file a1 > a
4 hg add a
5 hg commit -t "commit #0" -d "0 0" -u user
6 ls
7 echo This is file b1 > b
8 hg add b
9 hg commit -t "commit #1" -d "0 0" -u user
10 hg co 0
11 # B should disappear
12 ls
@@ -0,0 +1,12 b''
1 + hg init
2 + echo This is file a1
3 + hg add a
4 + hg commit -t 'commit #0' -d '0 0' -u user
5 + ls
6 a
7 + echo This is file b1
8 + hg add b
9 + hg commit -t 'commit #1' -d '0 0' -u user
10 + hg co 0
11 + ls
12 a
@@ -1076,7 +1076,11 b' class localrepository:'
1076 remove.append(f) # other deleted it
1076 remove.append(f) # other deleted it
1077 else:
1077 else:
1078 if n == m1.get(f, nullid): # same as parent
1078 if n == m1.get(f, nullid): # same as parent
1079 self.ui.debug("local created %s, keeping\n" % f)
1079 if p2 == pa: # going backwards?
1080 self.ui.debug("remote deleted %s\n" % f)
1081 remove.append(f)
1082 else:
1083 self.ui.debug("local created %s, keeping\n" % f)
1080 else:
1084 else:
1081 self.ui.debug("working dir created %s, keeping\n" % f)
1085 self.ui.debug("working dir created %s, keeping\n" % f)
1082
1086
General Comments 0
You need to be logged in to leave comments. Login now