Mercurial > hg
annotate tests/test-issue3084.t @ 51681:522b4d729e89
mmap: populate the mapping by default
Without pre-population, accessing all data through a mmap can result in many
pagefault, reducing performance significantly. If the mmap is prepopulated, the
performance can no longer get slower than a full read.
(See benchmark number below)
In some cases were very few data is read, prepopulating can be overkill and
slower than populating on access (through page fault). So that behavior can be
controlled when the caller can pre-determine the best behavior.
(See benchmark number below)
In addition, testing with populating in a secondary thread yield great result
combining the best of each approach. This might be implemented in later
changesets.
In all cases, using mmap has a great effect on memory usage when many processes
run in parallel on the same machine.
### Benchmarks
# What did I run
A couple of month back I ran a large benchmark campaign to assess the impact of
various approach for using mmap with the revlog (and other files), it
highlighted a few benchmarks that capture the impact of the changes well. So to
validate this change I checked the following:
- log command displaying various revisions
(read the changelog index)
- log command displaying the patch of listed revisions
(read the changelog index, the manifest index and a few files indexes)
- unbundling a few revisions
(read and write changelog, manifest and few files indexes, and walk the graph
to update some cache)
- pushing a few revisions
(read and write changelog, manifest and few files indexes, walk the graph to
update some cache, performs various accesses locally and remotely during
discovery)
Benchmarks were run using the default module policy (c+py) and the rust one. No
significant difference were found between the two implementation, so we will
present result using the default policy (unless otherwise specified).
I ran them on a few repositories :
- mercurial: a "public changeset only" copy of mercurial from 2018-08-01 using
zstd compression and sparse-revlog
- pypy: a copy of pypy from 2018-08-01 using zstd compression and sparse-revlog
- netbeans: a copy of netbeans from 2018-08-01 using zstd compression and
sparse-revlog
- mozilla-try: a copy of mozilla-try from 2019-02-18 using zstd compression and
sparse-revlog
- mozilla-try persistent-nodemap: Same as the above but with a persistent
nodemap. Used for the log --patch benchmark only
# Results
For the smaller repositories (mercurial, pypy), the impact of mmap is almost
imperceptible, other cost dominating the operation. The impact of prepopulating
is undiscernible in the benchmark we ran.
For larger repositories the benchmark support explanation given above:
On netbeans, the log can be about 1% faster without repopulation (for a
difference < 100ms) but unbundle becomes a bit slower, even when small.
### data-env-vars.name = netbeans-2018-08-01-zstd-sparse-revlog
# benchmark.name = hg.command.unbundle
# benchmark.variants.issue6528 = disabled
# benchmark.variants.reuse-external-delta-parent = yes
# benchmark.variants.revs = any-1-extra-rev
# benchmark.variants.source = unbundle
# benchmark.variants.verbosity = quiet
with-populate: 0.240157
no-populate: 0.265087 (+10.38%, +0.02)
# benchmark.variants.revs = any-100-extra-rev
with-populate: 1.459518
no-populate: 1.481290 (+1.49%, +0.02)
## benchmark.name = hg.command.push
# benchmark.variants.explicit-rev = none
# benchmark.variants.issue6528 = disabled
# benchmark.variants.protocol = ssh
# benchmark.variants.reuse-external-delta-parent = yes
# benchmark.variants.revs = any-1-extra-rev
with-populate: 0.771919
no-populate: 0.792025 (+2.60%, +0.02)
# benchmark.variants.revs = any-100-extra-rev
with-populate: 1.459518
no-populate: 1.481290 (+1.49%, +0.02)
For mozilla-try, the "slow down" from pre-populate for small `hg log` is more
visible, but still small in absolute time. (using rust value for the persistent
nodemap value to be relevant).
### data-env-vars.name = mozilla-try-2019-02-18-ds2-pnm
# benchmark.name = hg.command.log
# bin-env-vars.hg.flavor = rust
# benchmark.variants.patch = yes
# benchmark.variants.limit-rev = 1
with-populate: 0.237813
no-populate: 0.229452 (-3.52%, -0.01)
# benchmark.variants.limit-rev = 10
# benchmark.variants.patch = yes
with-populate: 1.213578
no-populate: 1.205189
### data-env-vars.name = mozilla-try-2019-02-18-zstd-sparse-revlog
# benchmark.variants.limit-rev = 1000
# benchmark.variants.patch = no
# benchmark.variants.rev = tip
with-populate: 0.198607
no-populate: 0.195038 (-1.80%, -0.00)
However pre-populating provide a significant boost on more complex operations
like unbundle or push:
### data-env-vars.name = mozilla-try-2019-02-18-zstd-sparse-revlog
# benchmark.name = hg.command.push
# benchmark.variants.explicit-rev = none
# benchmark.variants.issue6528 = disabled
# benchmark.variants.protocol = ssh
# benchmark.variants.reuse-external-delta-parent = yes
# benchmark.variants.revs = any-1-extra-rev
with-populate: 4.798632
no-populate: 4.953295 (+3.22%, +0.15)
# benchmark.variants.revs = any-100-extra-rev
with-populate: 4.903618
no-populate: 5.014963 (+2.27%, +0.11)
## benchmark.name = hg.command.unbundle
# benchmark.variants.revs = any-1-extra-rev
with-populate: 1.423411
no-populate: 1.585365 (+11.38%, +0.16)
# benchmark.variants.revs = any-100-extra-rev
with-populate: 1.537909
no-populate: 1.688489 (+9.79%, +0.15)
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 11 Apr 2024 00:02:07 +0200 |
parents | 9d5c27890790 |
children |
rev | line source |
---|---|
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
1 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
2 $ echo "[extensions]" >> $HGRCPATH |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
3 $ echo "largefiles =" >> $HGRCPATH |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
4 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
5 Create the repository outside $HOME since largefiles write to |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
6 $HOME/.cache/largefiles. |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
7 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
8 $ hg init test |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
9 $ cd test |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
10 $ echo "root" > root |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
11 $ hg add root |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
12 $ hg commit -m "Root commit" --config extensions.largefiles=! |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
13 |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
14 Ensure that .hg/largefiles isn't created before largefiles are added |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
15 #if unix-permissions |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
16 $ chmod 555 .hg |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
17 #endif |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
18 $ hg status |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
19 #if unix-permissions |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
20 $ chmod 755 .hg |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
21 #endif |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
22 |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
23 $ test -f .hg/largefiles |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
24 [1] |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
25 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
26 $ echo "large" > foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
27 $ hg add --large foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
28 $ hg commit -m "Add foo as a largefile" |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
29 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
30 $ hg update -r 0 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
31 getting changed largefiles |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
32 0 largefiles updated, 1 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16913
diff
changeset
|
33 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
34 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
35 $ echo "normal" > foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
36 $ hg add foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
37 $ hg commit -m "Add foo as normal file" |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
38 created new head |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
39 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
40 Normal file in the working copy, keeping the normal version: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
41 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
42 $ echo "n" | hg merge --config ui.interactive=Yes |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
43 remote turned local normal file foo into a largefile |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
44 use (l)argefile or keep (n)ormal file? n |
23493
28f01c318c05
largefiles: don't use 'r' action for standin that doesn't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
23492
diff
changeset
|
45 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
46 (branch merge, don't forget to commit) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
47 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
48 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
49 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
50 normal |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
51 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
52 Normal file in the working copy, keeping the largefile version: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
53 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
54 $ hg update -q -C |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
55 $ echo "l" | hg merge --config ui.interactive=Yes |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
56 remote turned local normal file foo into a largefile |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
57 use (l)argefile or keep (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:
22288
diff
changeset
|
58 getting changed largefiles |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
59 1 largefiles updated, 0 removed |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
60 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
61 (branch merge, don't forget to commit) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
62 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
63 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
64 M foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
65 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
66 $ hg diff --nodates |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
67 diff -r fa129ab6b5a7 .hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
68 --- /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
69 +++ b/.hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
70 @@ -0,0 +1,1 @@ |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
71 +7f7097b041ccf68cc5561e9600da4655d21c6d18 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
72 diff -r fa129ab6b5a7 foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
73 --- a/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
74 +++ /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
75 @@ -1,1 +0,0 @@ |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
76 -normal |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
77 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
78 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
79 large |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
80 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
81 Largefile in the working copy, keeping the normal version: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
82 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
83 $ hg update -q -C -r 1 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
84 $ echo "n" | hg merge --config ui.interactive=Yes |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
85 remote turned local largefile foo into a normal file |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
86 keep (l)argefile or use (n)ormal file? n |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
87 getting changed largefiles |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
88 0 largefiles updated, 0 removed |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
89 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
90 (branch merge, don't forget to commit) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
91 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
92 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
93 M foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
94 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
95 $ hg diff --nodates |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
96 diff -r ff521236428a .hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
97 --- a/.hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
98 +++ /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
99 @@ -1,1 +0,0 @@ |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
100 -7f7097b041ccf68cc5561e9600da4655d21c6d18 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
101 diff -r ff521236428a foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
102 --- /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
103 +++ b/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
104 @@ -0,0 +1,1 @@ |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
105 +normal |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
106 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
107 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
108 normal |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
109 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
110 Largefile in the working copy, keeping the largefile version: |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
111 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
112 $ hg update -q -C -r 1 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
113 $ echo "l" | hg merge --config ui.interactive=Yes |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
114 remote turned local largefile foo into a normal file |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
115 keep (l)argefile or use (n)ormal file? l |
23492
da733837cdd0
largefiles: don't use 'r' action for normal file that doesn't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
23420
diff
changeset
|
116 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
117 (branch merge, don't forget to commit) |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
118 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
119 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
120 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
121 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
122 large |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15663
diff
changeset
|
123 |
19954
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
124 Whatever ... commit something so we can invoke merge when updating |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
125 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
126 $ hg commit -m '3: Merge' |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
127 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
128 Updating from largefile to normal - no reason to prompt |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
129 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
130 $ hg up -r 2 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
131 getting changed largefiles |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
132 0 largefiles updated, 0 removed |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
133 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
134 $ cat foo |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
135 normal |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
136 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
137 (the update above used to leave the working dir in a very weird state - clean it |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
138 $ hg up -qr null |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
139 $ hg up -qr 2 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
140 ) |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
141 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
142 Updating from normal to largefile - no reason to prompt |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
143 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
144 $ hg up -r 3 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
145 getting changed largefiles |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
146 1 largefiles updated, 0 removed |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
147 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
148 $ cat foo |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
149 large |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
150 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15663
diff
changeset
|
151 $ cd .. |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
152 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
153 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
154 Systematic testing of merges involving largefiles: |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
155 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
156 Ancestor: normal Parent: normal-id Parent: large result: large |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
157 Ancestor: normal Parent: normal2 Parent: large result: ? |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
158 Ancestor: large Parent: large-id Parent: normal result: normal |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
159 Ancestor: large Parent: large2 Parent: normal result: ? |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
160 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
161 All cases should try merging both ways. |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
162 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
163 Prepare test repo: |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
164 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
165 $ hg init merges |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
166 $ cd merges |
21917
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
167 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
168 prepare cases with "normal" ancestor: |
21917
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
169 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
170 $ hg up -qr null |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
171 $ echo normal > f |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
172 $ hg ci -Aqm "normal-ancestor" |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
173 $ hg tag -l "normal-ancestor" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
174 $ touch f2 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
175 $ hg ci -Aqm "normal-id" |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
176 $ hg tag -l "normal-id" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
177 $ echo normal2 > f |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
178 $ hg ci -m "normal2" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
179 $ hg tag -l "normal2" |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
180 $ echo normal > f |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
181 $ hg ci -Aqm "normal-same" |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
182 $ hg tag -l "normal-same" |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
183 $ hg up -qr "normal-ancestor" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
184 $ hg rm f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
185 $ echo large > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
186 $ hg add --large f |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
187 $ hg ci -qm "large" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
188 $ hg tag -l "large" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
189 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
190 prepare cases with "large" ancestor: |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
191 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
192 $ hg up -qr null |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
193 $ echo large > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
194 $ hg add --large f |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
195 $ hg ci -qm "large-ancestor" |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
196 $ hg tag -l "large-ancestor" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
197 $ touch f2 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
198 $ hg ci -Aqm "large-id" |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
199 $ hg tag -l "large-id" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
200 $ echo large2 > f |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
201 $ hg ci -m "large2" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
202 $ hg tag -l "large2" |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
203 $ echo large > f |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
204 $ hg ci -Aqm "large-same" |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
205 $ hg tag -l "large-same" |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
206 $ hg up -qr "large-ancestor" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
207 $ hg rm f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
208 $ echo normal > f |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
209 $ hg ci -qAm "normal" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
210 $ hg tag -l "normal" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
211 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
212 $ hg log -GT '{tags}' |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
213 @ normal tip |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
214 | |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
215 | o large-same |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
216 | | |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
217 | o large2 |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
218 | | |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
219 | o large-id |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
220 |/ |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
221 o large-ancestor |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
222 |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
223 o large |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
224 | |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
225 | o normal-same |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
226 | | |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
227 | o normal2 |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
228 | | |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
229 | o normal-id |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
230 |/ |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
231 o normal-ancestor |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
232 |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
233 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
234 |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
235 Ancestor: normal Parent: normal-id Parent: large result: large |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
236 |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
237 $ hg up -Cqr normal-id |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
238 $ hg merge -r large |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
239 getting changed largefiles |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
240 1 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
241 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
242 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
243 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
244 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
245 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
246 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
247 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
248 $ hg up -Cqr large |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
249 $ hg merge -r normal-id |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
250 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
251 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
252 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
253 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
254 |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
255 Ancestor: normal Parent: normal-same Parent: large result: large |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
256 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
257 $ hg up -Cqr normal-same |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
258 $ hg merge -r large |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
259 getting changed largefiles |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
260 1 largefiles updated, 0 removed |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
261 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
262 (branch merge, don't forget to commit) |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
263 $ cat f |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
264 large |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
265 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
266 swap |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
267 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
268 $ hg up -Cqr large |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
269 $ hg merge -r normal-same |
23420
902554884335
merge: before cd/dc prompt, check that changed side really changed
Mads Kiilerich <madski@unity3d.com>
parents:
23419
diff
changeset
|
270 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
271 (branch merge, don't forget to commit) |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
272 $ cat f |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
273 large |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
274 |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
275 Ancestor: normal Parent: normal2 Parent: large result: ? |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
276 (annoying extra prompt ... but it do not do any serious harm) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
277 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
278 $ hg up -Cqr normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
279 $ hg merge -r large |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
280 remote turned local normal file f into a largefile |
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
281 use (l)argefile or keep (n)ormal file? l |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
282 getting changed largefiles |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
283 1 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
284 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
285 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
286 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
287 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
288 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
289 $ hg up -Cqr normal2 |
23541
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
290 $ echo n | hg merge -r large --config ui.interactive=Yes |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
291 remote turned local normal file f into a largefile |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
292 use (l)argefile or keep (n)ormal file? n |
23493
28f01c318c05
largefiles: don't use 'r' action for standin that doesn't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
23492
diff
changeset
|
293 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
294 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
295 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
296 normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
297 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
298 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
299 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
300 $ hg up -Cqr large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
301 $ hg merge -r normal2 |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
302 remote turned local largefile f into a normal file |
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
303 keep (l)argefile or use (n)ormal file? l |
23492
da733837cdd0
largefiles: don't use 'r' action for normal file that doesn't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
23420
diff
changeset
|
304 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
305 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
306 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
307 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
308 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
309 $ hg up -Cqr large |
23541
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
310 $ echo n | hg merge -r normal2 --config ui.interactive=Yes |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
311 remote turned local largefile f 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:
22288
diff
changeset
|
312 keep (l)argefile or use (n)ormal file? n |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
313 getting changed largefiles |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
314 0 largefiles updated, 0 removed |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
315 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
316 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
317 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
318 normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
319 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
320 Ancestor: large Parent: large-id Parent: normal result: normal |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
321 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
322 $ hg up -Cqr large-id |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
323 $ hg merge -r normal |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
324 getting changed largefiles |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
325 0 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
326 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
327 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
328 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
329 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
330 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
331 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
332 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
333 $ hg up -Cqr normal |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
334 $ hg merge -r large-id |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
335 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
336 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
337 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
338 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
339 |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
340 Ancestor: large Parent: large-same Parent: normal result: normal |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
341 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
342 $ hg up -Cqr large-same |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
343 $ hg merge -r normal |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
344 getting changed largefiles |
23419
a34a99181f36
largefiles: don't show largefile/normal prompts if one side is unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23418
diff
changeset
|
345 0 largefiles updated, 0 removed |
a34a99181f36
largefiles: don't show largefile/normal prompts if one side is unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23418
diff
changeset
|
346 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
347 (branch merge, don't forget to commit) |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
348 $ cat f |
23419
a34a99181f36
largefiles: don't show largefile/normal prompts if one side is unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23418
diff
changeset
|
349 normal |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
350 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
351 swap |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
352 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
353 $ hg up -Cqr normal |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
354 $ hg merge -r large-same |
23420
902554884335
merge: before cd/dc prompt, check that changed side really changed
Mads Kiilerich <madski@unity3d.com>
parents:
23419
diff
changeset
|
355 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
356 (branch merge, don't forget to commit) |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
357 $ cat f |
23419
a34a99181f36
largefiles: don't show largefile/normal prompts if one side is unchanged
Mads Kiilerich <madski@unity3d.com>
parents:
23418
diff
changeset
|
358 normal |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
359 |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
360 Ancestor: large Parent: large2 Parent: normal result: ? |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
361 (annoying extra prompt ... but it do not do any serious harm) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
362 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
363 $ hg up -Cqr large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
364 $ hg merge -r normal |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
365 remote turned local largefile f into a normal file |
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
366 keep (l)argefile or use (n)ormal file? l |
23492
da733837cdd0
largefiles: don't use 'r' action for normal file that doesn't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
23420
diff
changeset
|
367 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
368 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
369 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
370 large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
371 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
372 $ hg up -Cqr large2 |
23541
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
373 $ echo n | hg merge -r normal --config ui.interactive=Yes |
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
374 remote turned local largefile f into a normal file |
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
375 keep (l)argefile or use (n)ormal file? n |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
376 getting changed largefiles |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
377 0 largefiles updated, 0 removed |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
378 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
379 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
380 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
381 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
382 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
383 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
384 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
385 $ hg up -Cqr normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
386 $ hg merge -r large2 |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
387 remote turned local normal file f into a largefile |
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
388 use (l)argefile or keep (n)ormal file? l |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
389 getting changed largefiles |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
390 1 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
391 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
392 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
393 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
394 large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
395 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
396 $ hg up -Cqr normal |
23541
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
397 $ echo n | hg merge -r large2 --config ui.interactive=Yes |
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
398 remote turned local normal file f into a largefile |
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
399 use (l)argefile or keep (n)ormal file? n |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
400 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
401 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
402 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
403 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
404 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
405 $ cd .. |