Mercurial > hg
annotate tests/test-largefiles-update.t @ 40397:36b134c436b8
setup: build exewrapper with Unicode support on py3
I didn't see a compiler switch documented anywhere, but I diffed the command
line for full VC++ project when toggling between MBCS and Unicode. This is all
they do.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 19 Oct 2018 18:34:42 -0400 |
parents | 7e99b02768ef |
children | 37e75be0b019 |
rev | line source |
---|---|
37348
f4e84dfc06fd
tests: skip largefiles and lfs tests when using simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35816
diff
changeset
|
1 #require no-reposimplestore |
f4e84dfc06fd
tests: skip largefiles and lfs tests when using simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35816
diff
changeset
|
2 |
21932
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
3 This file focuses mainly on updating largefiles in the working |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
4 directory (and ".hg/largefiles/dirstate") |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
5 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
6 $ cat >> $HGRCPATH <<EOF |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
7 > [ui] |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
8 > merge = internal:fail |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
9 > [extensions] |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
10 > largefiles = |
28052
b59ef0c21405
tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28035
diff
changeset
|
11 > [extdiff] |
b59ef0c21405
tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28035
diff
changeset
|
12 > # for portability: |
b59ef0c21405
tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28035
diff
changeset
|
13 > pdiff = sh "$RUNTESTDIR/pdiff" |
21932
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
14 > EOF |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
15 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
16 $ hg init repo |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
17 $ cd repo |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
18 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
19 $ echo large1 > large1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
20 $ echo large2 > large2 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
21 $ hg add --large large1 large2 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
22 $ echo normal1 > normal1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
23 $ hg add normal1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
24 $ hg commit -m '#0' |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
25 $ echo 'large1 in #1' > large1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
26 $ echo 'normal1 in #1' > normal1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
27 $ hg commit -m '#1' |
28052
b59ef0c21405
tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28035
diff
changeset
|
28 $ hg pdiff -r '.^' --config extensions.extdiff= |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28030
diff
changeset
|
29 diff -Nru repo.0d9d9b8dc9a3/.hglf/large1 repo/.hglf/large1 |
25812
68822b7cdd01
extdiff: use archiver to take snapshots of committed revisions
Matt Harbison <matt_harbison@yahoo.com>
parents:
23841
diff
changeset
|
30 --- repo.0d9d9b8dc9a3/.hglf/large1 * (glob) |
68822b7cdd01
extdiff: use archiver to take snapshots of committed revisions
Matt Harbison <matt_harbison@yahoo.com>
parents:
23841
diff
changeset
|
31 +++ repo/.hglf/large1 * (glob) |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28033
diff
changeset
|
32 @@ -1* +1* @@ (glob) |
25812
68822b7cdd01
extdiff: use archiver to take snapshots of committed revisions
Matt Harbison <matt_harbison@yahoo.com>
parents:
23841
diff
changeset
|
33 -4669e532d5b2c093a78eca010077e708a071bb64 |
68822b7cdd01
extdiff: use archiver to take snapshots of committed revisions
Matt Harbison <matt_harbison@yahoo.com>
parents:
23841
diff
changeset
|
34 +58e24f733a964da346e2407a2bee99d9001184f5 |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28030
diff
changeset
|
35 diff -Nru repo.0d9d9b8dc9a3/normal1 repo/normal1 |
25812
68822b7cdd01
extdiff: use archiver to take snapshots of committed revisions
Matt Harbison <matt_harbison@yahoo.com>
parents:
23841
diff
changeset
|
36 --- repo.0d9d9b8dc9a3/normal1 * (glob) |
68822b7cdd01
extdiff: use archiver to take snapshots of committed revisions
Matt Harbison <matt_harbison@yahoo.com>
parents:
23841
diff
changeset
|
37 +++ repo/normal1 * (glob) |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28033
diff
changeset
|
38 @@ -1* +1* @@ (glob) |
25812
68822b7cdd01
extdiff: use archiver to take snapshots of committed revisions
Matt Harbison <matt_harbison@yahoo.com>
parents:
23841
diff
changeset
|
39 -normal1 |
68822b7cdd01
extdiff: use archiver to take snapshots of committed revisions
Matt Harbison <matt_harbison@yahoo.com>
parents:
23841
diff
changeset
|
40 +normal1 in #1 |
68822b7cdd01
extdiff: use archiver to take snapshots of committed revisions
Matt Harbison <matt_harbison@yahoo.com>
parents:
23841
diff
changeset
|
41 [1] |
21932
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
42 $ hg update -q -C 0 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
43 $ echo 'large2 in #2' > large2 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
44 $ hg commit -m '#2' |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
45 created new head |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
46 |
23841
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
47 Test that update also updates the lfdirstate of 'unsure' largefiles after |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
48 hashing them: |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
49 |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
50 The previous operations will usually have left us with largefiles with a mtime |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
51 within the same second as the dirstate was written. |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
52 The lfdirstate entries will thus have been written with an invalidated/unset |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
53 mtime to make sure further changes within the same second is detected. |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
54 We will however occasionally be "lucky" and get a tick between writing |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
55 largefiles and writing dirstate so we get valid lfdirstate timestamps. The |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
56 following verification is thus disabled but can be verified manually. |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
57 |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
58 #if false |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
59 $ hg debugdirstate --large --nodate |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
60 n 644 7 unset large1 |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
61 n 644 13 unset large2 |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
62 #endif |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
63 |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
64 Wait to make sure we get a tick so the mtime of the largefiles become valid. |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
65 |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
66 $ sleep 1 |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
67 |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
68 A linear merge will update standins before performing the actual merge. It will |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
69 do a lfdirstate status walk and find 'unset'/'unsure' files, hash them, and |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
70 update the corresponding standins. |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
71 Verify that it actually marks the clean files as clean in lfdirstate so |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
72 we don't have to hash them again next time we update. |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
73 |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
74 $ hg up |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
75 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32698
1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30858
diff
changeset
|
76 updated to "f74e50bd9e55: #2" |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27903
diff
changeset
|
77 1 other heads for branch "default" |
23841
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
78 $ hg debugdirstate --large --nodate |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
79 n 644 7 set large1 |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
80 n 644 13 set large2 |
9d25bb84cf6c
largefiles: make linear update set unsure largefiles normal if unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23840
diff
changeset
|
81 |
23694
97eb62b0f4a9
tests: add test coverage for lfdirstate invalidation of linear update
Mads Kiilerich <madski@unity3d.com>
parents:
23383
diff
changeset
|
82 Test that lfdirstate keeps track of last modification of largefiles and |
97eb62b0f4a9
tests: add test coverage for lfdirstate invalidation of linear update
Mads Kiilerich <madski@unity3d.com>
parents:
23383
diff
changeset
|
83 prevents unnecessary hashing of content - also after linear/noop update |
97eb62b0f4a9
tests: add test coverage for lfdirstate invalidation of linear update
Mads Kiilerich <madski@unity3d.com>
parents:
23383
diff
changeset
|
84 |
97eb62b0f4a9
tests: add test coverage for lfdirstate invalidation of linear update
Mads Kiilerich <madski@unity3d.com>
parents:
23383
diff
changeset
|
85 $ sleep 1 |
97eb62b0f4a9
tests: add test coverage for lfdirstate invalidation of linear update
Mads Kiilerich <madski@unity3d.com>
parents:
23383
diff
changeset
|
86 $ hg st |
97eb62b0f4a9
tests: add test coverage for lfdirstate invalidation of linear update
Mads Kiilerich <madski@unity3d.com>
parents:
23383
diff
changeset
|
87 $ hg debugdirstate --large --nodate |
23840
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
88 n 644 7 set large1 |
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
89 n 644 13 set large2 |
23694
97eb62b0f4a9
tests: add test coverage for lfdirstate invalidation of linear update
Mads Kiilerich <madski@unity3d.com>
parents:
23383
diff
changeset
|
90 $ hg up |
97eb62b0f4a9
tests: add test coverage for lfdirstate invalidation of linear update
Mads Kiilerich <madski@unity3d.com>
parents:
23383
diff
changeset
|
91 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32698
1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30858
diff
changeset
|
92 updated to "f74e50bd9e55: #2" |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27903
diff
changeset
|
93 1 other heads for branch "default" |
23694
97eb62b0f4a9
tests: add test coverage for lfdirstate invalidation of linear update
Mads Kiilerich <madski@unity3d.com>
parents:
23383
diff
changeset
|
94 $ hg debugdirstate --large --nodate |
23840
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
95 n 644 7 set large1 |
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
96 n 644 13 set large2 |
23694
97eb62b0f4a9
tests: add test coverage for lfdirstate invalidation of linear update
Mads Kiilerich <madski@unity3d.com>
parents:
23383
diff
changeset
|
97 |
21932
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
98 Test that "hg merge" updates largefiles from "other" correctly |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
99 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
100 (getting largefiles from "other" normally) |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
101 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
102 $ hg status -A large1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
103 C large1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
104 $ cat large1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
105 large1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
106 $ cat .hglf/large1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
107 4669e532d5b2c093a78eca010077e708a071bb64 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
108 $ hg merge --config debug.dirstate.delaywrite=2 |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
109 getting changed largefiles |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
110 1 largefiles updated, 0 removed |
21932
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
111 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
112 (branch merge, don't forget to commit) |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
113 $ hg status -A large1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
114 M large1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
115 $ cat large1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
116 large1 in #1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
117 $ cat .hglf/large1 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
118 58e24f733a964da346e2407a2bee99d9001184f5 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
119 $ hg diff -c 1 --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
120 -4669e532d5b2c093a78eca010077e708a071bb64 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
121 +58e24f733a964da346e2407a2bee99d9001184f5 |
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
122 |
21933
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
123 (getting largefiles from "other" via conflict prompt) |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
124 |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
125 $ hg update -q -C 2 |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
126 $ echo 'large1 in #3' > large1 |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
127 $ echo 'normal1 in #3' > normal1 |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
128 $ hg commit -m '#3' |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
129 $ cat .hglf/large1 |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
130 e5bb990443d6a92aaf7223813720f7566c9dd05b |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
131 $ hg merge --config debug.dirstate.delaywrite=2 --config ui.interactive=True <<EOF |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
132 > o |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
133 > EOF |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
134 largefile large1 has a merge conflict |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
135 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
136 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
137 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
138 merging normal1 |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
25812
diff
changeset
|
139 warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark') |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
140 getting changed largefiles |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
141 1 largefiles updated, 0 removed |
21933
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
142 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
143 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
21933
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
144 [1] |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
145 $ hg status -A large1 |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
146 M large1 |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
147 $ cat large1 |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
148 large1 in #1 |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
149 $ cat .hglf/large1 |
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
150 58e24f733a964da346e2407a2bee99d9001184f5 |
30189
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
151 $ rm normal1.orig |
21933
8ecbe55fd09d
largefiles: invoke "normallookup" on "lfdirstate" for merged files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21932
diff
changeset
|
152 |
26627
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
153 (merge non-existing largefiles from "other" via conflict prompt - |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
154 make sure the following commit doesn't abort in a confusing way when trying to |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
155 mark the non-existing file as normal in lfdirstate) |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
156 |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
157 $ mv .hg/largefiles/58e24f733a964da346e2407a2bee99d9001184f5 . |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
158 $ hg update -q -C 3 |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
159 $ hg merge --config largefiles.usercache=not --config debug.dirstate.delaywrite=2 --tool :local --config ui.interactive=True <<EOF |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
160 > o |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
161 > EOF |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
162 largefile large1 has a merge conflict |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
163 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
164 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
165 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
166 getting changed largefiles |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
167 large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from file:/*/$TESTTMP/repo (glob) |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
168 0 largefiles updated, 0 removed |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
169 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
170 (branch merge, don't forget to commit) |
27903
512a814c5595
largefiles: fix commit of missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
27789
diff
changeset
|
171 $ hg commit -m '1-2-3 testing' --config largefiles.usercache=not |
512a814c5595
largefiles: fix commit of missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
27789
diff
changeset
|
172 large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from local store |
512a814c5595
largefiles: fix commit of missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
27789
diff
changeset
|
173 $ hg up -C . --config largefiles.usercache=not |
512a814c5595
largefiles: fix commit of missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
27789
diff
changeset
|
174 getting changed largefiles |
512a814c5595
largefiles: fix commit of missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
27789
diff
changeset
|
175 large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from file:/*/$TESTTMP/repo (glob) |
512a814c5595
largefiles: fix commit of missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
27789
diff
changeset
|
176 0 largefiles updated, 0 removed |
512a814c5595
largefiles: fix commit of missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
27789
diff
changeset
|
177 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
512a814c5595
largefiles: fix commit of missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
27789
diff
changeset
|
178 $ hg st large1 |
512a814c5595
largefiles: fix commit of missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
27789
diff
changeset
|
179 ! large1 |
26627
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
180 $ hg rollback -q |
27903
512a814c5595
largefiles: fix commit of missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
27789
diff
changeset
|
181 $ mv 58e24f733a964da346e2407a2bee99d9001184f5 .hg/largefiles/ |
26627
832c98d79587
largefiles: better handling of merge of largefiles that not are available
Mads Kiilerich <madski@unity3d.com>
parents:
26614
diff
changeset
|
182 |
21934
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
183 Test that "hg revert -r REV" updates largefiles from "REV" correctly |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
184 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
185 $ hg update -q -C 3 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
186 $ hg status -A large1 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
187 C large1 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
188 $ cat large1 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
189 large1 in #3 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
190 $ cat .hglf/large1 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
191 e5bb990443d6a92aaf7223813720f7566c9dd05b |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
192 $ hg diff -c 1 --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
193 -4669e532d5b2c093a78eca010077e708a071bb64 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
194 +58e24f733a964da346e2407a2bee99d9001184f5 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
195 $ hg revert --no-backup -r 1 --config debug.dirstate.delaywrite=2 large1 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
196 $ hg status -A large1 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
197 M large1 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
198 $ cat large1 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
199 large1 in #1 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
200 $ cat .hglf/large1 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
201 58e24f733a964da346e2407a2bee99d9001184f5 |
0cb34b3991f8
largefiles: use "normallookup" on "lfdirstate" while reverting
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21933
diff
changeset
|
202 |
22096
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
203 Test that "hg rollback" restores status of largefiles correctly |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
204 |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
205 $ hg update -C -q |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
206 $ hg remove large1 |
22285
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
207 $ test -f .hglf/large1 |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
208 [1] |
22096
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
209 $ hg forget large2 |
22285
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
210 $ test -f .hglf/large2 |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
211 [1] |
22096
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
212 $ echo largeX > largeX |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
213 $ hg add --large largeX |
22285
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
214 $ cat .hglf/largeX |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
215 |
22096
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
216 $ hg commit -m 'will be rollback-ed soon' |
22097
7d1eac06ab2b
largefiles: drop orphan entries from lfdristat at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22096
diff
changeset
|
217 $ echo largeY > largeY |
7d1eac06ab2b
largefiles: drop orphan entries from lfdristat at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22096
diff
changeset
|
218 $ hg add --large largeY |
33344
1e872b08a4e9
test-largefiles-update: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
219 |
23058
6099b518643c
tests: add "(glob)" for l10n messages in test-largefiles-update.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22590
diff
changeset
|
220 $ hg status -A large1 |
35230
feecfefeba25
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
221 large1: $ENOENT$ |
33344
1e872b08a4e9
test-largefiles-update: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
222 |
22096
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
223 $ hg status -A large2 |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
224 ? large2 |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
225 $ hg status -A largeX |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
226 C largeX |
22097
7d1eac06ab2b
largefiles: drop orphan entries from lfdristat at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22096
diff
changeset
|
227 $ hg status -A largeY |
7d1eac06ab2b
largefiles: drop orphan entries from lfdristat at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22096
diff
changeset
|
228 A largeY |
22096
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
229 $ hg rollback |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
230 repository tip rolled back to revision 3 (undo commit) |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
231 working directory now based on revision 3 |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
232 $ hg status -A large1 |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
233 R large1 |
22285
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
234 $ test -f .hglf/large1 |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
235 [1] |
22096
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
236 $ hg status -A large2 |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
237 R large2 |
22285
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
238 $ test -f .hglf/large2 |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
239 [1] |
22096
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
240 $ hg status -A largeX |
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
241 A largeX |
22285
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
242 $ cat .hglf/largeX |
85bded43cc80
largefiles: restore standins according to restored dirstate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22284
diff
changeset
|
243 |
22097
7d1eac06ab2b
largefiles: drop orphan entries from lfdristat at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22096
diff
changeset
|
244 $ hg status -A largeY |
7d1eac06ab2b
largefiles: drop orphan entries from lfdristat at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22096
diff
changeset
|
245 ? largeY |
22286
3f3b9483e7ef
largefiles: unlink standins not known to the restored dirstate at rollback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22285
diff
changeset
|
246 $ test -f .hglf/largeY |
3f3b9483e7ef
largefiles: unlink standins not known to the restored dirstate at rollback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22285
diff
changeset
|
247 [1] |
30189
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
248 $ rm largeY |
22096
61e526585b20
largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21934
diff
changeset
|
249 |
22283
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
250 Test that "hg rollback" restores standins correctly |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
251 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
252 $ hg commit -m 'will be rollback-ed soon' |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
253 $ hg update -q -C 2 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
254 $ cat large1 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
255 large1 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
256 $ cat .hglf/large1 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
257 4669e532d5b2c093a78eca010077e708a071bb64 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
258 $ cat large2 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
259 large2 in #2 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
260 $ cat .hglf/large2 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
261 3cfce6277e7668985707b6887ce56f9f62f6ccd9 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
262 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
263 $ hg rollback -q -f |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
264 $ cat large1 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
265 large1 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
266 $ cat .hglf/large1 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
267 4669e532d5b2c093a78eca010077e708a071bb64 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
268 $ cat large2 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
269 large2 in #2 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
270 $ cat .hglf/large2 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
271 3cfce6277e7668985707b6887ce56f9f62f6ccd9 |
cb556ea76dcd
largefiles: omit restoring standins if working parent is not rollbacked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22197
diff
changeset
|
272 |
22284
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
273 (rollback the parent of the working directory, when the parent of it |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
274 is not branch-tip) |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
275 |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
276 $ hg update -q -C 1 |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
277 $ cat .hglf/large1 |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
278 58e24f733a964da346e2407a2bee99d9001184f5 |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
279 $ cat .hglf/large2 |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
280 1deebade43c8c498a3c8daddac0244dc55d1331d |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
281 |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
282 $ echo normalX > normalX |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
283 $ hg add normalX |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
284 $ hg commit -m 'will be rollback-ed soon' |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
285 $ hg rollback -q |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
286 |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
287 $ cat .hglf/large1 |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
288 58e24f733a964da346e2407a2bee99d9001184f5 |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
289 $ cat .hglf/large2 |
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
290 1deebade43c8c498a3c8daddac0244dc55d1331d |
30189
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
291 $ rm normalX |
22284
72b378658cff
largefiles: restore standins from non branch-tip parent at rollback correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22283
diff
changeset
|
292 |
22098
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
293 Test that "hg status" shows status of largefiles correctly just after |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
294 automated commit like rebase/transplant |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
295 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
296 $ cat >> .hg/hgrc <<EOF |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
297 > [extensions] |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
298 > rebase = |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
299 > strip = |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
300 > transplant = |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
301 > EOF |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
302 $ hg update -q -C 1 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
303 $ hg remove large1 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
304 $ echo largeX > largeX |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
305 $ hg add --large largeX |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
306 $ hg commit -m '#4' |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
307 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
308 $ hg rebase -s 1 -d 2 --keep |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23394
diff
changeset
|
309 rebasing 1:72518492caa6 "#1" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23394
diff
changeset
|
310 rebasing 4:07d6153b5c04 "#4" (tip) |
33344
1e872b08a4e9
test-largefiles-update: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
311 |
23058
6099b518643c
tests: add "(glob)" for l10n messages in test-largefiles-update.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22590
diff
changeset
|
312 $ hg status -A large1 |
35230
feecfefeba25
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
313 large1: $ENOENT$ |
33344
1e872b08a4e9
test-largefiles-update: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
314 |
22098
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
315 $ hg status -A largeX |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
316 C largeX |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
317 $ hg strip -q 5 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
318 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
319 $ hg update -q -C 2 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
320 $ hg transplant -q 1 4 |
33344
1e872b08a4e9
test-largefiles-update: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
321 |
23058
6099b518643c
tests: add "(glob)" for l10n messages in test-largefiles-update.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22590
diff
changeset
|
322 $ hg status -A large1 |
35230
feecfefeba25
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
323 large1: $ENOENT$ |
33344
1e872b08a4e9
test-largefiles-update: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
324 |
22098
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
325 $ hg status -A largeX |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
326 C largeX |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
327 $ hg strip -q 5 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
328 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
329 $ hg update -q -C 2 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
330 $ hg transplant -q --merge 1 --merge 4 |
33344
1e872b08a4e9
test-largefiles-update: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
331 |
23058
6099b518643c
tests: add "(glob)" for l10n messages in test-largefiles-update.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22590
diff
changeset
|
332 $ hg status -A large1 |
35230
feecfefeba25
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
333 large1: $ENOENT$ |
33344
1e872b08a4e9
test-largefiles-update: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
334 |
22098
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
335 $ hg status -A largeX |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
336 C largeX |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
337 $ hg strip -q 5 |
2fb3c1c0b4ef
largefiles: synchronize lfdirstate with dirstate after automated committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22097
diff
changeset
|
338 |
22195
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
339 Test that linear merge can detect modification (and conflict) correctly |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
340 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
341 (linear merge without conflict) |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
342 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
343 $ echo 'large2 for linear merge (no conflict)' > large2 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
344 $ hg update 3 --config debug.dirstate.delaywrite=2 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
345 getting changed largefiles |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
346 1 largefiles updated, 0 removed |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
347 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
348 $ hg status -A large2 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
349 M large2 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
350 $ cat large2 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
351 large2 for linear merge (no conflict) |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
352 $ cat .hglf/large2 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
353 9c4bf8f1b33536d6e5f89447e10620cfe52ea710 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
354 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
355 (linear merge with conflict, choosing "other") |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
356 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
357 $ hg update -q -C 2 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
358 $ echo 'large1 for linear merge (conflict)' > large1 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
359 $ hg update 3 --config ui.interactive=True <<EOF |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
360 > o |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
361 > EOF |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
362 largefile large1 has a merge conflict |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
363 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
364 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
365 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? o |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
366 getting changed largefiles |
22195
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
367 1 largefiles updated, 0 removed |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
368 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
369 $ hg status -A large1 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
370 C large1 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
371 $ cat large1 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
372 large1 in #3 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
373 $ cat .hglf/large1 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
374 e5bb990443d6a92aaf7223813720f7566c9dd05b |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
375 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
376 (linear merge with conflict, choosing "local") |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
377 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
378 $ hg update -q -C 2 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
379 $ echo 'large1 for linear merge (conflict)' > large1 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
380 $ hg update 3 --config debug.dirstate.delaywrite=2 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
381 largefile large1 has a merge conflict |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
382 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
383 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
384 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
385 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
386 $ hg status -A large1 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
387 M large1 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
388 $ cat large1 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
389 large1 for linear merge (conflict) |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
390 $ cat .hglf/large1 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
391 ba94c2efe5b7c5e0af8d189295ce00553b0612b7 |
1dad76c0afb7
largefiles: add test for large/normal conflict at linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22098
diff
changeset
|
392 |
22196
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
393 Test a linear merge to a revision containing same-name normal file |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
394 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
395 $ hg update -q -C 3 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
396 $ hg remove large2 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
397 $ echo 'large2 as normal file' > large2 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
398 $ hg add large2 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
399 $ echo 'large3 as normal file' > large3 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
400 $ hg add large3 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
401 $ hg commit -m '#5' |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
402 $ hg manifest |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
403 .hglf/large1 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
404 large2 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
405 large3 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
406 normal1 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
407 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
408 (modified largefile is already switched to normal) |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
409 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
410 $ hg update -q -C 2 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
411 $ echo 'modified large2 for linear merge' > large2 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
412 $ hg update -q 5 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
413 remote turned local largefile large2 into a normal file |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
414 keep (l)argefile or use (n)ormal file? l |
39760
7e99b02768ef
debugdirstate: deprecate --nodates in favor of --no-dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
39480
diff
changeset
|
415 $ hg debugdirstate --no-dates | grep large2 |
23840
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
416 a 0 -1 unset .hglf/large2 |
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
417 r 0 0 set large2 |
22197
f72d73937853
largefiles: update lfdirstate for unchanged largefiles during linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22196
diff
changeset
|
418 $ hg status -A large2 |
f72d73937853
largefiles: update lfdirstate for unchanged largefiles during linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22196
diff
changeset
|
419 A large2 |
22196
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
420 $ cat large2 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
421 modified large2 for linear merge |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
422 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
423 (added largefile is already committed as normal) |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
424 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
425 $ hg update -q -C 2 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
426 $ echo 'large3 as large file for linear merge' > large3 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
427 $ hg add --large large3 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
428 $ hg update -q 5 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
429 remote turned local largefile large3 into a normal file |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
430 keep (l)argefile or use (n)ormal file? l |
39760
7e99b02768ef
debugdirstate: deprecate --nodates in favor of --no-dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
39480
diff
changeset
|
431 $ hg debugdirstate --no-dates | grep large3 |
23840
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
432 a 0 -1 unset .hglf/large3 |
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
433 r 0 0 set large3 |
22197
f72d73937853
largefiles: update lfdirstate for unchanged largefiles during linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22196
diff
changeset
|
434 $ hg status -A large3 |
f72d73937853
largefiles: update lfdirstate for unchanged largefiles during linear merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22196
diff
changeset
|
435 A large3 |
22196
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
436 $ cat large3 |
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
437 large3 as large file for linear merge |
22287
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
438 $ rm -f large3 .hglf/large3 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
439 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
440 Test that the internal linear merging works correctly |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
441 (both heads are stripped to keep pairing of revision number and commit log) |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
442 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
443 $ hg update -q -C 2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
444 $ hg strip 3 4 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35230
diff
changeset
|
445 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-2e7b195d-backup.hg |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
23706
diff
changeset
|
446 $ mv .hg/strip-backup/9530e27857f7-2e7b195d-backup.hg $TESTTMP |
22287
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
447 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
448 (internal linear merging at "hg pull --update") |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
449 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
450 $ echo 'large1 for linear merge (conflict)' > large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
451 $ echo 'large2 for linear merge (conflict with normal file)' > large2 |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
23706
diff
changeset
|
452 $ hg pull --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35230
diff
changeset
|
453 pulling from $TESTTMP/9530e27857f7-2e7b195d-backup.hg |
22287
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
454 searching for changes |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
455 adding changesets |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
456 adding manifests |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
457 adding file changes |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
458 added 3 changesets with 5 changes to 5 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
39285
diff
changeset
|
459 new changesets 9530e27857f7:d65e59e952a9 (3 drafts) |
22287
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
460 remote turned local largefile large2 into a normal file |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
461 keep (l)argefile or use (n)ormal file? l |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
462 largefile large1 has a merge conflict |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
463 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
464 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
465 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
466 2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
32698
1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30858
diff
changeset
|
467 updated to "d65e59e952a9: #5" |
28030
ca2a0a654f54
update: warn about other topological head in pull and unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28029
diff
changeset
|
468 1 other heads for branch "default" |
22287
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
469 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
470 $ hg status -A large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
471 M large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
472 $ cat large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
473 large1 for linear merge (conflict) |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
474 $ cat .hglf/large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
475 ba94c2efe5b7c5e0af8d189295ce00553b0612b7 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
476 $ hg status -A large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
477 A large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
478 $ cat large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
479 large2 for linear merge (conflict with normal file) |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
480 $ cat .hglf/large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
481 d7591fe9be0f6227d90bddf3e4f52ff41fc1f544 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
482 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
483 (internal linear merging at "hg unbundle --update") |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
484 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
485 $ hg update -q -C 2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
486 $ hg rollback -q |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
487 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
488 $ echo 'large1 for linear merge (conflict)' > large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
489 $ echo 'large2 for linear merge (conflict with normal file)' > large2 |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
23706
diff
changeset
|
490 $ hg unbundle --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg |
22287
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
491 adding changesets |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
492 adding manifests |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
493 adding file changes |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
494 added 3 changesets with 5 changes to 5 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
39285
diff
changeset
|
495 new changesets 9530e27857f7:d65e59e952a9 (3 drafts) |
22287
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
496 remote turned local largefile large2 into a normal file |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
497 keep (l)argefile or use (n)ormal file? l |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
498 largefile large1 has a merge conflict |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
499 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
500 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
501 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
502 2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
32698
1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30858
diff
changeset
|
503 updated to "d65e59e952a9: #5" |
28030
ca2a0a654f54
update: warn about other topological head in pull and unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28029
diff
changeset
|
504 1 other heads for branch "default" |
22287
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
505 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
506 $ hg status -A large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
507 M large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
508 $ cat large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
509 large1 for linear merge (conflict) |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
510 $ cat .hglf/large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
511 ba94c2efe5b7c5e0af8d189295ce00553b0612b7 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
512 $ hg status -A large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
513 A large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
514 $ cat large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
515 large2 for linear merge (conflict with normal file) |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
516 $ cat .hglf/large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
517 d7591fe9be0f6227d90bddf3e4f52ff41fc1f544 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
518 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
519 (internal linear merging in subrepo at "hg update") |
22196
23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22195
diff
changeset
|
520 |
21932
21a2f31f054d
largefiles: use "normallookup", if "mtime" of standin is unset
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
521 $ cd .. |
22287
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
522 $ hg init subparent |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
523 $ cd subparent |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
524 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
525 $ hg clone -q -u 2 ../repo sub |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
526 $ cat > .hgsub <<EOF |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
527 > sub = sub |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
528 > EOF |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
529 $ hg add .hgsub |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
530 $ hg commit -m '#0@parent' |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
531 $ cat .hgsubstate |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
532 f74e50bd9e5594b7cf1e6c5cbab86ddd25f3ca2f sub |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
533 $ hg -R sub update -q |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
534 $ hg commit -m '#1@parent' |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
535 $ cat .hgsubstate |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
536 d65e59e952a9638e2ce863b41a420ca723dd3e8d sub |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
537 $ hg update -q 0 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
538 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
539 $ echo 'large1 for linear merge (conflict)' > sub/large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
540 $ echo 'large2 for linear merge (conflict with normal file)' > sub/large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
541 $ hg update --config ui.interactive=True --config debug.dirstate.delaywrite=2 <<EOF |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
542 > m |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
543 > r |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
544 > l |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
545 > l |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
546 > EOF |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
547 subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9) |
30060
a145161debed
merge: use labels in subrepo merge
Simon Farnsworth <simonfar@fb.com>
parents:
29775
diff
changeset
|
548 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
549 subrepository sources for sub differ (in checked out version) |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
550 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
551 remote turned local largefile large2 into a normal file |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
552 keep (l)argefile or use (n)ormal file? l |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
553 largefile large1 has a merge conflict |
22287
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
554 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
555 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
556 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
557 2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
22287
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
558 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
559 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
560 $ hg -R sub status -A sub/large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
561 M sub/large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
562 $ cat sub/large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
563 large1 for linear merge (conflict) |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
564 $ cat sub/.hglf/large1 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
565 ba94c2efe5b7c5e0af8d189295ce00553b0612b7 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
566 $ hg -R sub status -A sub/large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
567 A sub/large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
568 $ cat sub/large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
569 large2 for linear merge (conflict with normal file) |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
570 $ cat sub/.hglf/large2 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
571 d7591fe9be0f6227d90bddf3e4f52ff41fc1f544 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
572 |
f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22286
diff
changeset
|
573 $ cd .. |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
574 $ cd repo |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
575 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
576 Test that rebase updates largefiles in the working directory even if |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
577 it is aborted by conflict. |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
578 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
579 $ hg update -q -C 3 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
580 $ cat .hglf/large1 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
581 e5bb990443d6a92aaf7223813720f7566c9dd05b |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
582 $ cat large1 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
583 large1 in #3 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
584 $ hg rebase -s 1 -d 3 --keep --config ui.interactive=True <<EOF |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
585 > o |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
586 > EOF |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23394
diff
changeset
|
587 rebasing 1:72518492caa6 "#1" |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
588 largefile large1 has a merge conflict |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
589 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
590 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
591 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22289
diff
changeset
|
592 merging normal1 |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
25812
diff
changeset
|
593 warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark') |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
594 unresolved conflicts (see hg resolve, then hg rebase --continue) |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
595 [1] |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
596 $ cat .hglf/large1 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
597 58e24f733a964da346e2407a2bee99d9001184f5 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
598 $ cat large1 |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
599 large1 in #1 |
30189
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
600 $ rm normal1.orig |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
601 |
23187
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
602 Test that rebase updates standins for manually modified largefiles at |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
603 the 1st commit of resuming. |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
604 |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
605 $ echo "manually modified before 'hg rebase --continue'" > large1 |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
606 $ hg resolve -m normal1 |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
607 (no more unresolved files) |
27626
157675d0f600
rebase: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents:
27163
diff
changeset
|
608 continue: hg rebase --continue |
23187
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
609 $ hg rebase --continue --config ui.interactive=True <<EOF |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
610 > c |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
611 > EOF |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23394
diff
changeset
|
612 rebasing 1:72518492caa6 "#1" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23394
diff
changeset
|
613 rebasing 4:07d6153b5c04 "#4" |
39285
a3fd84f4fb38
filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39284
diff
changeset
|
614 file '.hglf/large1' was deleted in other [source] but was modified in local [dest]. |
39277
f785073f792c
merge: improve interactive one-changed one-deleted message (issue5550)
Augie Fackler <augie@google.com>
parents:
37348
diff
changeset
|
615 What do you want to do? |
27163
27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26627
diff
changeset
|
616 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
23187
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
617 |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
618 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
619 -e5bb990443d6a92aaf7223813720f7566c9dd05b |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
620 +8a4f783556e7dea21139ca0466eafce954c75c13 |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
621 $ rm -f large1 |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
622 $ hg update -q -C tip |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
623 $ cat large1 |
f726b05ecfe6
largefiles: update standins only at the 1st commit of "hg rebase --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
624 manually modified before 'hg rebase --continue' |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
625 |
22289
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
626 Test that transplant updates largefiles, of which standins are safely |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
627 changed, even if it is aborted by conflict of other. |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
628 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
629 $ hg update -q -C 5 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
630 $ cat .hglf/large1 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
631 e5bb990443d6a92aaf7223813720f7566c9dd05b |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
632 $ cat large1 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
633 large1 in #3 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
634 $ hg diff -c 4 .hglf/largeX | grep '^[+-][0-9a-z]' |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
635 +fa44618ea25181aff4f48b70428294790cec9f61 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
636 $ hg transplant 4 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
637 applying 07d6153b5c04 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
638 patching file .hglf/large1 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
639 Hunk #1 FAILED at 0 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
640 1 out of 1 hunks FAILED -- saving rejects to file .hglf/large1.rej |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
641 patch failed to apply |
27676
1c48f348f2d0
transplant: correct language to use working directory
timeless <timeless@mozdev.org>
parents:
27626
diff
changeset
|
642 abort: fix up the working directory and run hg transplant --continue |
22289
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
643 [255] |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
644 $ hg status -A large1 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
645 C large1 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
646 $ cat .hglf/large1 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
647 e5bb990443d6a92aaf7223813720f7566c9dd05b |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
648 $ cat large1 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
649 large1 in #3 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
650 $ hg status -A largeX |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
651 A largeX |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
652 $ cat .hglf/largeX |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
653 fa44618ea25181aff4f48b70428294790cec9f61 |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
654 $ cat largeX |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
655 largeX |
e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22288
diff
changeset
|
656 |
23274
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
657 Test that transplant updates standins for manually modified largefiles |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
658 at the 1st commit of resuming. |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
659 |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
660 $ echo "manually modified before 'hg transplant --continue'" > large1 |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
661 $ hg transplant --continue |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
662 07d6153b5c04 transplanted as f1bf30eb88cc |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
663 $ hg diff -c tip .hglf/large1 | grep '^[+-][0-9a-z]' |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
664 -e5bb990443d6a92aaf7223813720f7566c9dd05b |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
665 +6a4f36d4075fbe0f30ec1d26ca44e63c05903671 |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
666 $ rm -f large1 |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
667 $ hg update -q -C tip |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
668 $ cat large1 |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
669 manually modified before 'hg transplant --continue' |
0ec2e124fcc0
largefiles: update standins only at the 1st commit of "transplant --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23187
diff
changeset
|
670 |
23089
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23058
diff
changeset
|
671 Test that "hg status" doesn't show removal of largefiles not managed |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23058
diff
changeset
|
672 in the target context. |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23058
diff
changeset
|
673 |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23058
diff
changeset
|
674 $ hg update -q -C 4 |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23058
diff
changeset
|
675 $ hg remove largeX |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23058
diff
changeset
|
676 $ hg status -A largeX |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23058
diff
changeset
|
677 R largeX |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23058
diff
changeset
|
678 $ hg status -A --rev '.^1' largeX |
197dc4580da2
largefiles: ignore removal status of files not managed in the target context
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23058
diff
changeset
|
679 |
23090
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
680 #if execbit |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
681 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
682 Test that "hg status" against revisions other than parent notices exec |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
683 bit changes of largefiles. |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
684 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
685 $ hg update -q -C 4 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
686 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
687 (the case that large2 doesn't have exec bit in the target context but |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
688 in the working context) |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
689 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
690 $ chmod +x large2 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
691 $ hg status -A --rev 0 large2 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
692 M large2 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
693 $ hg commit -m 'chmod +x large2' |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
694 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
695 (the case that large2 has exec bit in the target context but not in |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
696 the working context) |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
697 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
698 $ echo dummy > dummy |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
699 $ hg add dummy |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
700 $ hg commit -m 'revision for separation' |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
701 $ chmod -x large2 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
702 $ hg status -A --rev '.^1' large2 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
703 M large2 |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
704 |
23383
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
705 #else |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
706 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
707 Test that "hg status" against revisions other than parent ignores exec |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
708 bit correctly on the platform being unaware of it. |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
709 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
710 $ hg update -q -C 4 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
711 |
30239
6e04f4ec4875
tests: put temporary file outside the working directory for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30215
diff
changeset
|
712 $ cat > ../exec-bit.patch <<EOF |
23383
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
713 > # HG changeset patch |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
714 > # User test |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
715 > # Date 0 0 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
716 > # Thu Jan 01 00:00:00 1970 +0000 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
717 > # Node ID be1b433a65b12b27b5519d92213e14f7e1769b90 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
718 > # Parent 07d6153b5c04313efb75deec9ba577de7faeb727 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
719 > chmod +x large2 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
720 > |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
721 > diff --git a/.hglf/large2 b/.hglf/large2 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
722 > old mode 100644 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
723 > new mode 100755 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
724 > EOF |
30239
6e04f4ec4875
tests: put temporary file outside the working directory for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30215
diff
changeset
|
725 $ hg import --exact --bypass ../exec-bit.patch |
6e04f4ec4875
tests: put temporary file outside the working directory for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30215
diff
changeset
|
726 applying ../exec-bit.patch |
23383
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
727 $ hg status -A --rev tip large2 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
728 C large2 |
7f8d27e1f862
largefiles: avoid exec-bit examination on the platform being unaware of it
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23090
diff
changeset
|
729 |
23090
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
730 #endif |
24600c9d7f4e
largefiles: add examination of exec bit in "hg status --rev REV" case
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23089
diff
changeset
|
731 |
35816
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
732 The fileset revset is evaluated for each revision, instead of once on wdir(), |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
733 and then patterns matched on each revision. Here, no exec bits are set in |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
734 wdir(), but a matching revision is detected. |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
735 |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
736 (Teach large2 is not an executable. Maybe this is a bug of largefiles.) |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
737 #if execbit |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
738 $ chmod -x .hglf/large2 |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
739 #endif |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
740 |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
741 $ hg files 'set:exec()' |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
742 [1] |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
743 $ hg log -qr 'file("set:exec()")' |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
744 9:be1b433a65b1 |
f6ca1e11d8b4
revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents:
35704
diff
changeset
|
745 |
30190
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
30189
diff
changeset
|
746 Test a fatal error interrupting an update. Verify that status report dirty |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
30189
diff
changeset
|
747 files correctly after an interrupted update. Also verify that checking all |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
30189
diff
changeset
|
748 hashes reveals it isn't clean. |
30189
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
749 |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
750 Start with clean dirstates: |
30858
2d6b86cadc10
tests: correct (I think) command in test-largefiles-update
Augie Fackler <augie@google.com>
parents:
30857
diff
changeset
|
751 $ hg up --quiet --clean --rev "8^" |
30189
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
752 $ sleep 1 |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
753 $ hg st |
30190
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
30189
diff
changeset
|
754 Update standins without updating largefiles - large1 is modified and largeX is |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
30189
diff
changeset
|
755 added: |
30189
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
756 $ cat << EOF > ../crashupdatelfiles.py |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
757 > import hgext.largefiles.lfutil |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
758 > def getlfilestoupdate(oldstandins, newstandins): |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
759 > raise SystemExit(7) |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
760 > hgext.largefiles.lfutil.getlfilestoupdate = getlfilestoupdate |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
761 > EOF |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
762 $ hg up -Cr "8" --config extensions.crashupdatelfiles=../crashupdatelfiles.py |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
763 [7] |
30190
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
30189
diff
changeset
|
764 Check large1 content and status ... and that update will undo modifications: |
30189
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
765 $ cat large1 |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
766 large1 in #3 |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
767 $ hg st |
30190
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
30189
diff
changeset
|
768 M large1 |
30191
328545c7d8a1
largefiles: fix 'deleted' files sometimes persistently appearing with R status
Mads Kiilerich <madski@unity3d.com>
parents:
30190
diff
changeset
|
769 ! largeX |
30189
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
770 $ hg up -Cr . |
30190
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
30189
diff
changeset
|
771 getting changed largefiles |
30191
328545c7d8a1
largefiles: fix 'deleted' files sometimes persistently appearing with R status
Mads Kiilerich <madski@unity3d.com>
parents:
30190
diff
changeset
|
772 2 largefiles updated, 0 removed |
328545c7d8a1
largefiles: fix 'deleted' files sometimes persistently appearing with R status
Mads Kiilerich <madski@unity3d.com>
parents:
30190
diff
changeset
|
773 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
30190
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
30189
diff
changeset
|
774 $ cat large1 |
56b930238036
largefiles: more safe handling of interruptions while updating modifications
Mads Kiilerich <madski@unity3d.com>
parents:
30189
diff
changeset
|
775 manually modified before 'hg transplant --continue' |
30189
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
776 $ hg st |
30191
328545c7d8a1
largefiles: fix 'deleted' files sometimes persistently appearing with R status
Mads Kiilerich <madski@unity3d.com>
parents:
30190
diff
changeset
|
777 Force largefiles rehashing and check that all changes have been caught by |
328545c7d8a1
largefiles: fix 'deleted' files sometimes persistently appearing with R status
Mads Kiilerich <madski@unity3d.com>
parents:
30190
diff
changeset
|
778 status and update: |
30189
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
779 $ rm .hg/largefiles/dirstate |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
780 $ hg st |
4999c12c526b
largefiles: test coverage of fatal interruption of update
Mads Kiilerich <madski@unity3d.com>
parents:
28052
diff
changeset
|
781 |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22287
diff
changeset
|
782 $ cd .. |
23276
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
783 |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
784 Test that "hg convert" avoids copying largefiles from the working |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
785 directory into store, because "hg convert" doesn't update largefiles |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
786 in the working directory (removing files under ".cache/largefiles" |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
787 forces "hg convert" to copy corresponding largefiles) |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
788 |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
789 $ cat >> $HGRCPATH <<EOF |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
790 > [extensions] |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
791 > convert = |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
792 > EOF |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
793 |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
794 $ rm $TESTTMP/.cache/largefiles/6a4f36d4075fbe0f30ec1d26ca44e63c05903671 |
4be754832829
largefiles: move "copyalltostore" invocation into "markcommitted"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23274
diff
changeset
|
795 $ hg convert -q repo repo.converted |