mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
f5a07da3f0
Before this patch, largefiles gotten from "other" revision (with
conflict) at "hg merge" become "clean" unexpectedly in steps below:
1. "repo.status()" is invoked (for status check before merging)
1-1 "dirstate" entry for standinfile SF is "normal"-ed
1-2 "lfdirstate" entry of largefile LF (for SF) is "normal"-ed
2. "merge.update()" is invoked
2-1 SF is updated in the working directory
(ASSUMPTION: user choice "other" at conflict)
2-2 "dirstate" entry for SF is "merge"-ed
3. "lfcommands.updatelfiles()" is invoked (by "overrides.hgmerge()")
3-1 largefile LF (for SF) is updated in the working directory
3-2 "dirstate" returns "m" for SF (by 2-2)
3-3 "lfdirstate" entry for LF is left as it is
3-4 "lfdirstate" is written into ".hg/largefiles/dirstate", and
timestamp of LF is stored into "lfdirstate" file (by 1-2)
(ASSUMPTION: timestamp of LF differs from one of "lfdirstate" file)
Then, "hs status" treats LF as "clean", even though LF is updated by
"other" revision (by 3-1), because "lfilesrepo.status()" always treats
"normal"-ed files (by 1-2 and 3-4) as "clean".
When state of standinfile in "dirstate" is "m", largefile should be
"normallookup"-ed.
This patch invokes "normallookup" on "lfdirstate" for merged files.
This patch uses "[debug] dirstate.delaywrite" feature in the test, to
ensure that timestamp of the largefile gotten from "other" revision is
stored into ".hg/largefiles/dirstate". (for ASSUMPTION at 3-4)
83 lines
2.3 KiB
Perl
83 lines
2.3 KiB
Perl
This file focuses mainly on updating largefiles in the working
|
|
directory (and ".hg/largefiles/dirstate")
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [ui]
|
|
> merge = internal:fail
|
|
> [extensions]
|
|
> largefiles =
|
|
> EOF
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ echo large1 > large1
|
|
$ echo large2 > large2
|
|
$ hg add --large large1 large2
|
|
$ echo normal1 > normal1
|
|
$ hg add normal1
|
|
$ hg commit -m '#0'
|
|
$ echo 'large1 in #1' > large1
|
|
$ echo 'normal1 in #1' > normal1
|
|
$ hg commit -m '#1'
|
|
$ hg update -q -C 0
|
|
$ echo 'large2 in #2' > large2
|
|
$ hg commit -m '#2'
|
|
created new head
|
|
|
|
Test that "hg merge" updates largefiles from "other" correctly
|
|
|
|
(getting largefiles from "other" normally)
|
|
|
|
$ hg status -A large1
|
|
C large1
|
|
$ cat large1
|
|
large1
|
|
$ cat .hglf/large1
|
|
4669e532d5b2c093a78eca010077e708a071bb64
|
|
$ hg merge --config debug.dirstate.delaywrite=2
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
$ hg status -A large1
|
|
M large1
|
|
$ cat large1
|
|
large1 in #1
|
|
$ cat .hglf/large1
|
|
58e24f733a964da346e2407a2bee99d9001184f5
|
|
$ hg diff -c 1 --nodates .hglf/large1 | grep '^[+-][0-9a-z]'
|
|
-4669e532d5b2c093a78eca010077e708a071bb64
|
|
+58e24f733a964da346e2407a2bee99d9001184f5
|
|
|
|
(getting largefiles from "other" via conflict prompt)
|
|
|
|
$ hg update -q -C 2
|
|
$ echo 'large1 in #3' > large1
|
|
$ echo 'normal1 in #3' > normal1
|
|
$ hg commit -m '#3'
|
|
$ cat .hglf/large1
|
|
e5bb990443d6a92aaf7223813720f7566c9dd05b
|
|
$ hg merge --config debug.dirstate.delaywrite=2 --config ui.interactive=True <<EOF
|
|
> o
|
|
> EOF
|
|
largefile large1 has a merge conflict
|
|
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
|
|
keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
|
|
take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? merging normal1
|
|
warning: conflicts during merge.
|
|
merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark')
|
|
0 files updated, 1 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
getting changed largefiles
|
|
1 largefiles updated, 0 removed
|
|
[1]
|
|
$ hg status -A large1
|
|
M large1
|
|
$ cat large1
|
|
large1 in #1
|
|
$ cat .hglf/large1
|
|
58e24f733a964da346e2407a2bee99d9001184f5
|
|
|
|
$ cd ..
|