Mercurial > hg
view tests/test-walk @ 990:5007e0bdeed2
Fix long-standing excessive file merges
Since switching to the multihead approach, we've been creating
excessive file-level merges where files are marked as merged with
their ancestors.
This explicitly checks at commit time whether the two parent versions
are linearly related, and if so, reduces the file check-in to a
non-merge. Then the file is compared against the remaining parent,
and, if equal, skips check-in of that file (as it's not changed).
Since we're not checking in all files that were different between
versions, we no longer need to mark so many files for merge. This
removes most of the 'm' state marking as well.
Finally, it is possible to do a tree-level merge with no file-level
changes. This will happen if one user changes file A and another
changes file B. Thus, if we have have two parents, we allow commit to
proceed even if there are no file-level changes.
author | mpm@selenic.com |
---|---|
date | Sun, 21 Aug 2005 21:59:55 -0700 |
parents | 01215ad04283 |
children | 1c64c628d15f |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init mkdir -p beans for b in kidney navy turtle borlotti black pinto; do echo $b > beans/$b done mkdir -p mammals/Procyonidae for m in cacomistle coatimundi raccoon; do echo $m > mammals/Procyonidae/$m done echo skunk > mammals/skunk echo fennel > fennel echo fenugreek > fenugreek echo fiddlehead > fiddlehead echo glob:glob > glob:glob hg addremove hg commit -m "commit #0" -d "0 0" hg debugwalk cd mammals hg debugwalk hg debugwalk Procyonidae cd Procyonidae hg debugwalk hg debugwalk .. cd .. hg debugwalk ../beans hg debugwalk cd .. hg debugwalk -Ibeans hg debugwalk 'mammals/../beans/b*' hg debugwalk '-X*/Procyonidae' mammals hg debugwalk path:mammals hg debugwalk .. hg debugwalk beans/../.. # Don't know how to test absolute paths without always getting a false # error. #hg debugwalk `pwd`/beans #hg debugwalk `pwd`/.. hg debugwalk glob:\* hg debugwalk 're:.*[kb]$' hg debugwalk path:beans/black hg debugwalk beans 'beans/*' hg debugwalk 'j*' hg debugwalk NOEXIST mkfifo fifo hg debugwalk fifo rm fenugreek hg debugwalk fenugreek hg rm fenugreek hg debugwalk fenugreek touch new hg debugwalk new