Mercurial > hg

diff tests/test-convert-svn-branches.t @ 39111:46da52f4b820

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: try hard to reuse p1 manifest if nothing changed This is all for commit reproducibility on "hg convert". With this change, p1 manifest is reused if ctx.files() *to be committed* is empty, and if new manifest entry is identical to p1. This is important property for "hg convert" since memctx.files() built from a convert source may be either a) more narrowed thanks to a committed ctx.files() which provides more accurate status, or b) containing redundant files because of sloppy filtering on e.g. octopus merge.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 07 Jul 2018 22:40:39 +0900
parents 584044e5ad57
children
line wrap: on
line diff
--- a/tests/test-convert-svn-branches.t	Sun Aug 12 18:44:42 2018 +0900
+++ b/tests/test-convert-svn-branches.t	Sat Jul 07 22:40:39 2018 +0900
@@ -85,8 +85,8 @@
   $ hg branches
   newbranch                     11:a6d7cc050ad1
   default                       10:6e2b33404495
-  old                            9:93c4b0f99529
-  old2                           8:b52884d7bead (inactive)
+  old                            9:1b494af68c0b
+  old2                           8:5be40b8dcbf6 (inactive)
   $ hg tags -q
   tip
   $ cd ..