Mercurial > hg
annotate tests/test-issue3084.t @ 21917:ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Previously, the directory '.hg/largefiles' would always be created if it didn't
exist when the lfdirstate was opened. If there were no standin files, no
dirstate file would be created in the directory. The end result was that
enabling the largefiles extension globally, but not explicitly adding a
largefile would result in the repository eventually sprouting this directory.
Creation of this directory effectively changes readonly operations like summary
and status into operations that require write access. Without write access,
commands that would succeed without the extension loaded would abort with a
surprising error when the extension is loaded, but not actively used:
$ hg sum -R /tmp/thg --config extensions.largefiles=
parent: 16541:00dc703d5aed
repowidget: specify incoming bundle by plain file path to avoid url parsing
branch: default
abort: Permission denied: '/tmp/thg/.hg/largefiles'
This change is simpler than changing the callers of openlfdirstate() to use the
'create' parameter that was introduced in ae57920ac188, and probably how that
should have been implemented in the first place.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 17 Jul 2014 20:17:17 -0400 |
parents | e92c6524a76d |
children | a5168eb9b2bc |
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 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
12 $ hg commit -m "Root commit" |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
13 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
14 $ echo "large" > foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
15 $ hg add --large foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
16 $ 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
|
17 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
18 $ hg update -r 0 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
19 getting changed largefiles |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
20 0 largefiles updated, 1 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16913
diff
changeset
|
21 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
|
22 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
23 $ echo "normal" > foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
24 $ hg add foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
25 $ 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
|
26 created new head |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
27 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
28 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
|
29 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
30 $ 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
|
31 remote turned local normal file foo 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
|
32 use (l)argefile or keep (n)ormal file? 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
|
33 (branch merge, don't forget to commit) |
18724
894a5897a9dd
largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
34 getting changed largefiles |
894a5897a9dd
largefiles: getstandinmatcher should not depend on existence of directories
Mads Kiilerich <madski@unity3d.com>
parents:
18459
diff
changeset
|
35 0 largefiles updated, 0 removed |
15663
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
36 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
37 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
38 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
39 normal |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
40 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
41 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
|
42 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
43 $ hg update -q -C |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
44 $ 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
|
45 remote turned local normal file foo 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
|
46 use (l)argefile or keep (n)ormal file? 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
|
47 (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
|
48 getting changed largefiles |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
49 1 largefiles updated, 0 removed |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
50 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
51 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
52 M foo |
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 diff --nodates |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
55 diff -r fa129ab6b5a7 .hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
56 --- /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
57 +++ b/.hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
58 @@ -0,0 +1,1 @@ |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
59 +7f7097b041ccf68cc5561e9600da4655d21c6d18 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
60 diff -r fa129ab6b5a7 foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
61 --- a/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
62 +++ /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
63 @@ -1,1 +0,0 @@ |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
64 -normal |
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 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
67 large |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
68 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
69 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
|
70 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
71 $ hg update -q -C -r 1 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
72 $ 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
|
73 remote turned local largefile foo 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
|
74 keep (l)argefile or use (n)ormal file? 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
|
75 (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
|
76 getting changed largefiles |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
77 0 largefiles updated, 0 removed |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
78 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
79 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
80 M foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
81 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
82 $ hg diff --nodates |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
83 diff -r ff521236428a .hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
84 --- a/.hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
85 +++ /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
86 @@ -1,1 +0,0 @@ |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
87 -7f7097b041ccf68cc5561e9600da4655d21c6d18 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
88 diff -r ff521236428a foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
89 --- /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
90 +++ b/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
91 @@ -0,0 +1,1 @@ |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
92 +normal |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
93 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
94 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
95 normal |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
96 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
97 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
|
98 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
99 $ hg update -q -C -r 1 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
100 $ 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
|
101 remote turned local largefile foo 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
|
102 keep (l)argefile or use (n)ormal file? 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
|
103 (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
|
104 getting changed largefiles |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
105 1 largefiles updated, 0 removed |
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 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
108 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
109 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
110 large |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15663
diff
changeset
|
111 |
19954
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
112 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
|
113 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
114 $ 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
|
115 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
116 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
|
117 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
118 $ 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
|
119 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
|
120 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
|
121 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
|
122 $ cat foo |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
123 normal |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
124 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
125 (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
|
126 $ 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
|
127 $ 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
|
128 ) |
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 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
|
131 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
132 $ 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
|
133 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
|
134 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
|
135 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
|
136 $ cat foo |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
137 large |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
138 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15663
diff
changeset
|
139 $ cd .. |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
140 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
141 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
142 Systematic testing of merges involving largefiles: |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
143 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
144 Ancestor: normal Parent: normal= Parent: large result: large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
145 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
|
146 Ancestor: large Parent: large= Parent: normal result: normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
147 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
|
148 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
149 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
|
150 "=" means same file content. |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
151 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
152 Prepare test repo: |
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 $ hg init merges |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
155 $ cd merges |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
156 $ touch f1 |
21917
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
157 $ hg ci -Aqm "0-root" --config extensions.largefiles=! |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
158 |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
159 Ensure that .hg/largefiles isn't created before largefiles are added |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
160 #if unix-permissions |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
161 $ chmod 555 .hg |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
162 #endif |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
163 $ hg status |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
164 #if unix-permissions |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
165 $ chmod 755 .hg |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
166 #endif |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
167 |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
168 $ find .hg/largefiles |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
169 find: `.hg/largefiles': No such file or directory |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
170 [1] |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
171 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
172 ancestor is "normal": |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
173 $ echo normal > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
174 $ hg ci -Aqm "1-normal-ancestor" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
175 $ touch f2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
176 $ hg ci -Aqm "2-normal-unchanged" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
177 $ hg tag -l "normal=" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
178 $ echo normal2 > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
179 $ hg ci -m "3-normal2" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
180 $ hg tag -l "normal2" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
181 $ hg up -qr 1 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
182 $ hg rm f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
183 $ echo large > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
184 $ hg add --large f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
185 $ hg ci -qm "4-normal-to-large" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
186 $ hg tag -l "large" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
187 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
188 $ hg up -qr null |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
189 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
190 ancestor is "large": |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
191 $ echo large > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
192 $ hg add --large f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
193 $ hg ci -qm "5-large-ancestor" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
194 $ touch f2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
195 $ hg ci -Aqm "6-large-unchanged" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
196 $ hg tag -l "large=" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
197 $ echo large2 > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
198 $ hg ci -m "7-large2" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
199 $ hg tag -l "large2" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
200 $ hg up -qr 5 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
201 $ hg rm f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
202 $ echo normal > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
203 $ hg ci -qAm "8-large-to-normal" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
204 $ hg tag -l "normal" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
205 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
206 Ancestor: normal Parent: normal= Parent: large result: large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
207 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
208 $ hg up -Cqr normal= |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
209 $ hg merge -r large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
210 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
|
211 (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
|
212 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
213 1 largefiles updated, 0 removed |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
214 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
215 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
216 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
217 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
218 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
219 $ hg up -Cqr large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
220 $ hg merge -r normal= |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
221 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
|
222 (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
|
223 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
224 0 largefiles updated, 0 removed |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
225 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
226 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
227 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
228 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
|
229 (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
|
230 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
231 $ hg up -Cqr normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
232 $ hg merge -r large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
233 local changed f which remote deleted |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
234 use (c)hanged version or (d)elete? c |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
235 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
|
236 use (l)argefile or keep (n)ormal file? l |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
237 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
|
238 (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
|
239 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
240 1 largefiles updated, 0 removed |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
241 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
242 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
243 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
244 $ hg up -Cqr normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
245 $ ( echo c; echo n ) | hg merge -r large --config ui.interactive=Yes |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
246 local changed f which remote deleted |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
247 use (c)hanged version or (d)elete? 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
|
248 use (l)argefile or keep (n)ormal file? 0 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
|
249 (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
|
250 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
251 0 largefiles updated, 0 removed |
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 normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
254 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
255 $ hg up -Cqr normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
256 $ echo d | hg merge -r large --config ui.interactive=Yes |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
257 local changed f which remote deleted |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
258 use (c)hanged version or (d)elete? 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
|
259 (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
|
260 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
261 1 largefiles updated, 0 removed |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
262 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
263 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
264 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
265 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
266 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
267 $ hg up -Cqr large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
268 $ hg merge -r normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
269 remote changed f which local deleted |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
270 use (c)hanged version or leave (d)eleted? c |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
271 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
|
272 keep (l)argefile or use (n)ormal file? l |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
273 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
|
274 (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
|
275 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
276 1 largefiles updated, 0 removed |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
277 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
278 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
279 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
280 $ hg up -Cqr large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
281 $ ( echo c; echo n ) | hg merge -r normal2 --config ui.interactive=Yes |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
282 remote changed f which local deleted |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
283 use (c)hanged version or leave (d)eleted? 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
|
284 keep (l)argefile or use (n)ormal file? 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
|
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 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
287 0 largefiles updated, 0 removed |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
288 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
289 normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
290 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
291 $ hg up -Cqr large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
292 $ echo d | hg merge -r normal2 --config ui.interactive=Yes |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
293 remote changed f which local deleted |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
294 use (c)hanged version or leave (d)eleted? 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
|
295 (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
|
296 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
297 0 largefiles updated, 0 removed |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
298 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
299 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
300 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
301 Ancestor: large Parent: large= Parent: normal result: normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
302 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
303 $ hg up -Cqr large= |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
304 $ hg merge -r normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
305 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
|
306 (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
|
307 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
308 0 largefiles updated, 0 removed |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
309 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
310 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
311 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
312 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
313 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
314 $ hg up -Cqr normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
315 $ hg merge -r large= |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
316 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
|
317 (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
|
318 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
319 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
320 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
321 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
|
322 (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
|
323 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
324 $ hg up -Cqr large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
325 $ hg merge -r normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
326 local changed .hglf/f which remote deleted |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
327 use (c)hanged version or (d)elete? c |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
328 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
|
329 keep (l)argefile or use (n)ormal file? l |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
330 0 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
|
331 (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
|
332 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
333 1 largefiles updated, 0 removed |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
334 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
335 large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
336 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
337 $ hg up -Cqr large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
338 $ echo d | hg merge -r normal --config ui.interactive=Yes |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
339 local changed .hglf/f which remote deleted |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
340 use (c)hanged version or (d)elete? 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
|
341 (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
|
342 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
343 0 largefiles updated, 0 removed |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
344 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
345 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
346 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
347 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
348 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
349 $ hg up -Cqr normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
350 $ hg merge -r large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
351 remote changed .hglf/f which local deleted |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
352 use (c)hanged version or leave (d)eleted? c |
19967
e92c6524a76d
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Mads Kiilerich <madski@unity3d.com>
parents:
19966
diff
changeset
|
353 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
|
354 use (l)argefile or keep (n)ormal file? l |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
355 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
|
356 (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
|
357 getting changed largefiles |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
358 1 largefiles updated, 0 removed |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
359 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
360 large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
361 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
362 $ hg up -Cqr normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
363 $ echo d | hg merge -r large2 --config ui.interactive=Yes |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
364 remote changed .hglf/f which local deleted |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
365 use (c)hanged version or leave (d)eleted? 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
|
366 (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
|
367 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
368 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
369 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
370 $ cd .. |