Hello,
I think that solve the 'update' issue in case of 'overwrite' (with -C flag).
could it be included in the next release ?
--- merge.py.old 2010-02-06 14:29:13.000000000 +0100
+++ merge.py 2010-02-06 14:31:00.000000000 +0100
@@ -184,6 +184,12 @@
if n == m2[f] or m2[f] == a: # same or local newer
if m1.flags(f) != rflags:
act("update permissions", "e", f, rflags)
+ # in case of subrepos, update if overwrite and subrepos is
dirty
+ if overwrite and f == '.hgsubstate':
+ for s in p1.substate:
+ if p1.sub(s).dirty(): # if dirty, force update
+ act("remote is newer", "g", f, rflags)
+ break
elif n == a: # remote newer
act("remote is newer", "g", f, rflags)
else: # both changed
|