Mercurial > hg
annotate tests/test-issue3084.t @ 24134:afed5d2e7985
revert: display full subrepo output with --dry-run
Since the point of --dry-run is to show what will happen, the output with and
without it should agree. And since revert wasn't being called on subrepos with
--dry-run before, revert in the subrepo had to be defanged in this case.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 07 Feb 2015 21:47:28 -0500 |
parents | 495bc1b65d25 |
children | 9d5c27890790 |
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 |
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
|
116 getting changed largefiles |
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
|
117 0 largefiles updated, 0 removed |
da733837cdd0
largefiles: don't use 'r' action for normal file that doesn't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
23420
diff
changeset
|
118 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
|
119 (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
|
120 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
121 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
122 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
123 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
124 large |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15663
diff
changeset
|
125 |
19954
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
126 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
|
127 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
128 $ 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
|
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 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
|
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 2 |
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 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
|
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 normal |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
138 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
139 (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
|
140 $ 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
|
141 $ 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
|
142 ) |
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 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
|
145 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
146 $ 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
|
147 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
|
148 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
|
149 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
|
150 $ cat foo |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
151 large |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
152 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15663
diff
changeset
|
153 $ cd .. |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
154 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
155 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
156 Systematic testing of merges involving largefiles: |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
157 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
158 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
|
159 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
|
160 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
|
161 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
|
162 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
163 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
|
164 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
165 Prepare test repo: |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
166 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
167 $ hg init merges |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
168 $ cd merges |
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 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
|
171 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
172 $ hg up -qr null |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
173 $ echo normal > f |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
174 $ 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
|
175 $ hg tag -l "normal-ancestor" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
176 $ touch f2 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
177 $ 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
|
178 $ hg tag -l "normal-id" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
179 $ echo normal2 > f |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
180 $ hg ci -m "normal2" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
181 $ 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
|
182 $ 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
|
183 $ 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
|
184 $ 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
|
185 $ hg up -qr "normal-ancestor" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
186 $ hg rm f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
187 $ echo large > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
188 $ 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
|
189 $ hg ci -qm "large" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
190 $ hg tag -l "large" |
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 prepare cases with "large" ancestor: |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
193 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
194 $ hg up -qr null |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
195 $ echo large > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
196 $ 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
|
197 $ 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
|
198 $ hg tag -l "large-ancestor" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
199 $ touch f2 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
200 $ 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
|
201 $ hg tag -l "large-id" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
202 $ echo large2 > f |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
203 $ hg ci -m "large2" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
204 $ 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
|
205 $ 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
|
206 $ 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
|
207 $ 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
|
208 $ hg up -qr "large-ancestor" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
209 $ hg rm f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
210 $ echo normal > f |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
211 $ hg ci -qAm "normal" |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
212 $ hg tag -l "normal" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
213 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
214 $ hg log -GT '{tags}' |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
215 @ normal tip |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
216 | |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
217 | 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
|
218 | | |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
219 | o large2 |
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-id |
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-ancestor |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
224 |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
225 o large |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
226 | |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
227 | 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
|
228 | | |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
229 | o normal2 |
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-id |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
232 |/ |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
233 o normal-ancestor |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
234 |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
235 |
23417
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 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
|
238 |
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
239 $ hg up -Cqr normal-id |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
240 $ 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
|
241 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
|
242 1 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
243 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
|
244 (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
|
245 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
246 large |
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 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
249 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
250 $ 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
|
251 $ hg merge -r normal-id |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21930
diff
changeset
|
252 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
|
253 0 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
254 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
|
255 (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
|
256 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
257 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
258 |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
259 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
|
260 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
261 $ 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
|
262 $ 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
|
263 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
|
264 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
|
265 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
|
266 (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
|
267 $ 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
|
268 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 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
270 swap |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
271 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
272 $ 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
|
273 $ hg merge -r 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
|
274 getting changed largefiles |
23420
902554884335
merge: before cd/dc prompt, check that changed side really changed
Mads Kiilerich <madski@unity3d.com>
parents:
23419
diff
changeset
|
275 0 largefiles updated, 0 removed |
902554884335
merge: before cd/dc prompt, check that changed side really changed
Mads Kiilerich <madski@unity3d.com>
parents:
23419
diff
changeset
|
276 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
|
277 (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
|
278 $ 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
|
279 large |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
280 |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
281 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
|
282 (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
|
283 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
284 $ hg up -Cqr normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
285 $ 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
|
286 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
|
287 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
|
288 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
|
289 1 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
290 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
|
291 (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
|
292 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
293 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
294 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
295 $ hg up -Cqr normal2 |
23541
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
296 $ 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
|
297 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
|
298 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
|
299 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
|
300 (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
|
301 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
302 normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
303 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
304 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
305 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
306 $ hg up -Cqr large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
307 $ 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
|
308 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
|
309 keep (l)argefile or use (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
|
310 getting changed largefiles |
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
|
311 0 largefiles updated, 0 removed |
da733837cdd0
largefiles: don't use 'r' action for normal file that doesn't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
23420
diff
changeset
|
312 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
|
313 (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
|
314 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
315 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
316 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
317 $ hg up -Cqr large |
23541
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
318 $ 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
|
319 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
|
320 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
|
321 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
|
322 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
|
323 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
|
324 (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
|
325 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
326 normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
327 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
328 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
|
329 |
23417
442bb30171db
tests: clean-up of largefiles tests in test-issue3084.t
Mads Kiilerich <madski@unity3d.com>
parents:
22589
diff
changeset
|
330 $ hg up -Cqr large-id |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
331 $ 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
|
332 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
|
333 0 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
334 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
|
335 (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
|
336 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
337 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
338 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
339 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
340 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
341 $ 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
|
342 $ hg merge -r large-id |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
343 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
|
344 (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
|
345 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
346 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
347 |
23418
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
348 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
|
349 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
350 $ 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
|
351 $ 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
|
352 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
|
353 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
|
354 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
|
355 (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
|
356 $ 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
|
357 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
|
358 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
359 swap |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
360 |
c90d9ab6777a
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Mads Kiilerich <madski@unity3d.com>
parents:
23417
diff
changeset
|
361 $ 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
|
362 $ 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
|
363 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
|
364 (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
|
365 $ 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
|
366 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
|
367 |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
368 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
|
369 (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
|
370 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
371 $ hg up -Cqr large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
372 $ 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
|
373 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
|
374 keep (l)argefile or use (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
|
375 getting changed largefiles |
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
|
376 0 largefiles updated, 0 removed |
da733837cdd0
largefiles: don't use 'r' action for normal file that doesn't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
23420
diff
changeset
|
377 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
|
378 (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
|
379 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
380 large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
381 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
382 $ hg up -Cqr large2 |
23541
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
383 $ 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
|
384 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
|
385 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
|
386 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
|
387 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
|
388 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
|
389 (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
|
390 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
391 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
392 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
393 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
394 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
395 $ hg up -Cqr normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
396 $ 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
|
397 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
|
398 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
|
399 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
|
400 1 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
401 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
|
402 (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
|
403 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
404 large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
405 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
406 $ hg up -Cqr normal |
23541
495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23493
diff
changeset
|
407 $ 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
|
408 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
|
409 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
|
410 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
|
411 (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
|
412 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
413 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
414 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
415 $ cd .. |