[PATCH 2 of 4] keyword: same order for overwriting in rollback and record

Christian Ebert blacktrash at gmx.net
Sun Oct 10 10:17:30 CDT 2010


# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1286721222 -3600
# Node ID 79fac2c282472239594b336f14e7c124c84aa2ce
# Parent  2bacabb8a1e7a244d21baaad1cc29ec1b5b2908b
keyword: same order for overwriting in rollback and record

diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -527,8 +527,8 @@
                 if not dryrun:
                     ctx = self['.']
                     modified, added = _preselect(self[None].status(), changed)
+                    kwt.overwrite(ctx, modified, True, True)
                     kwt.overwrite(ctx, added, True, False)
-                    kwt.overwrite(ctx, modified, True, True)
                 return ret
             finally:
                 wlock.release()


More information about the Mercurial-devel mailing list