view tests/bundles/rebase.sh @ 48760:93d6f0e7ba2f

filemerge: move check for identical sides out of filemerge()

`filemerge.filemerge()` returns `None` if no merge was necessary
because the two sides were identical. I don't think it should be that
function's responsibility to handle that case; we should ideally not
even call `filemerge.filemerge()` if the two inputs identical. This
patch therefore moves the check out to the caller (`mergestate.py`).

The largefiles test changed because we now notice that the two sides
made the same change, so we don't consider it a merge. Also note that
the new message better matches the line above it in the test output.

Differential Revision: https://phab.mercurial-scm.org/D12154

#!/usr/bin/env bash
hg init rebase
cd rebase

#  @  7: 'H'
#  |
#  | o  6: 'G'
#  |/|
#  o |  5: 'F'
#  | |
#  | o  4: 'E'
#  |/
#  | o  3: 'D'
#  | |
#  | o  2: 'C'
#  | |
#  | o  1: 'B'
#  |/
#  o  0: 'A'

echo A > A
hg ci -Am A
echo B > B
hg ci -Am B
echo C > C
hg ci -Am C
echo D > D
hg ci -Am D
hg up -q -C 0
echo E > E
hg ci -Am E
hg up -q -C 0
echo F > F
hg ci -Am F
hg merge -r 4
hg ci -m G
hg up -q -C 5
echo H > H
hg ci -Am H

hg bundle -a ../rebase.hg

cd ..
rm -Rf rebase