Show More
@@ -873,9 +873,10 b' class localrepository:' | |||||
873 | if n != m2[f]: |
|
873 | if n != m2[f]: | |
874 | a = ma.get(f, nullid) |
|
874 | a = ma.get(f, nullid) | |
875 | if n != a and m2[f] != a: |
|
875 | if n != a and m2[f] != a: | |
876 |
self.ui.debug(" %s versions differ, |
|
876 | self.ui.debug(" %s versions differ, resolve\n" % f) | |
877 | merge[f] = (m1.get(f, nullid), m2[f]) |
|
877 | merge[f] = (m1.get(f, nullid), m2[f]) | |
878 |
el |
|
878 | elif m2[f] != a: | |
|
879 | self.ui.debug(" remote %s is newer, get\n" % f) | |||
879 | get[f] = m2[f] |
|
880 | get[f] = m2[f] | |
880 | del m2[f] |
|
881 | del m2[f] | |
881 | elif f in ma: |
|
882 | elif f in ma: | |
@@ -925,7 +926,7 b' class localrepository:' | |||||
925 | files.sort() |
|
926 | files.sort() | |
926 | for f in files: |
|
927 | for f in files: | |
927 | if f[0] == "/": continue |
|
928 | if f[0] == "/": continue | |
928 |
self.ui.note( |
|
929 | self.ui.note("getting %s\n" % f) | |
929 | t = self.file(f).revision(get[f]) |
|
930 | t = self.file(f).revision(get[f]) | |
930 | try: |
|
931 | try: | |
931 | file(self.wjoin(f), "w").write(t) |
|
932 | file(self.wjoin(f), "w").write(t) |
General Comments 0
You need to be logged in to leave comments.
Login now