Mercurial > hg
annotate tests/test-issue3084.t @ 23412:94092019e839 stable
mq: fix update of headers that occur in the "wrong" order
Mq tried to insert headers in the right order. Sometimes it would stop
searching before checking all headers and it could thus duplicate a header
instead of replacing it.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 28 Nov 2014 02:57:33 +0100 |
parents | 9ab18a912c44 |
children | 442bb30171db |
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 |
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
|
32 use (l)argefile or keep (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
|
33 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
|
34 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
|
35 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
|
36 (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
|
37 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
38 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
39 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
40 normal |
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 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
|
43 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
44 $ hg update -q -C |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
45 $ 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
|
46 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
|
47 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
|
48 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
|
49 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
|
50 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
|
51 (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
|
52 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
53 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
54 M foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
55 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
56 $ hg diff --nodates |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
57 diff -r fa129ab6b5a7 .hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
58 --- /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
59 +++ b/.hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
60 @@ -0,0 +1,1 @@ |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
61 +7f7097b041ccf68cc5561e9600da4655d21c6d18 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
62 diff -r fa129ab6b5a7 foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
63 --- a/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
64 +++ /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
65 @@ -1,1 +0,0 @@ |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
66 -normal |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
67 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
68 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
69 large |
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 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
|
72 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
73 $ hg update -q -C -r 1 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
74 $ 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
|
75 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
|
76 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
|
77 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
|
78 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
|
79 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
|
80 (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
|
81 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
82 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
83 M foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
84 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
85 $ hg diff --nodates |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
86 diff -r ff521236428a .hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
87 --- a/.hglf/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
88 +++ /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
89 @@ -1,1 +0,0 @@ |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
90 -7f7097b041ccf68cc5561e9600da4655d21c6d18 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
91 diff -r ff521236428a foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
92 --- /dev/null |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
93 +++ b/foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
94 @@ -0,0 +1,1 @@ |
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 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
98 normal |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
99 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
100 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
|
101 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
102 $ hg update -q -C -r 1 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
103 $ 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
|
104 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
|
105 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
|
106 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
|
107 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
|
108 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
|
109 (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
|
110 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
111 $ hg status |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
112 |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
113 $ cat foo |
9036c7d106bf
largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents:
diff
changeset
|
114 large |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15663
diff
changeset
|
115 |
19954
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
116 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
|
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 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
|
119 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
120 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
|
121 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
122 $ 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
|
123 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
|
124 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
|
125 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
|
126 $ cat foo |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
127 normal |
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 (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
|
130 $ 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
|
131 $ 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
|
132 ) |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
133 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
134 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
|
135 |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
136 $ 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
|
137 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
|
138 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
|
139 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
|
140 $ cat foo |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
141 large |
427ce5633c1c
largefiles: don't prompt for normal/largefile changes when doing plain updates
Mads Kiilerich <madski@unity3d.com>
parents:
18724
diff
changeset
|
142 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15663
diff
changeset
|
143 $ cd .. |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
144 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
145 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
146 Systematic testing of merges involving largefiles: |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
147 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
148 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
|
149 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
|
150 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
|
151 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
|
152 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
153 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
|
154 "=" means same file content. |
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 Prepare test repo: |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
157 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
158 $ hg init merges |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
159 $ cd merges |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
160 $ touch f1 |
21917
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
161 $ 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
|
162 |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
163 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
|
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 555 .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 $ hg status |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
168 #if unix-permissions |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
169 $ chmod 755 .hg |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
170 #endif |
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
171 |
21930
a5168eb9b2bc
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21917
diff
changeset
|
172 $ test -f .hg/largefiles |
21917
ac3b3a2d976d
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Matt Harbison <matt_harbison@yahoo.com>
parents:
19967
diff
changeset
|
173 [1] |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
174 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
175 ancestor is "normal": |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
176 $ echo normal > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
177 $ hg ci -Aqm "1-normal-ancestor" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
178 $ touch f2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
179 $ hg ci -Aqm "2-normal-unchanged" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
180 $ hg tag -l "normal=" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
181 $ echo normal2 > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
182 $ hg ci -m "3-normal2" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
183 $ hg tag -l "normal2" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
184 $ hg up -qr 1 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
185 $ hg rm f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
186 $ echo large > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
187 $ hg add --large f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
188 $ 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
|
189 $ hg tag -l "large" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
190 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
191 $ hg up -qr null |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
192 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
193 ancestor is "large": |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
194 $ echo large > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
195 $ hg add --large f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
196 $ hg ci -qm "5-large-ancestor" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
197 $ touch f2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
198 $ hg ci -Aqm "6-large-unchanged" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
199 $ hg tag -l "large=" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
200 $ echo large2 > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
201 $ hg ci -m "7-large2" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
202 $ hg tag -l "large2" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
203 $ hg up -qr 5 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
204 $ hg rm f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
205 $ echo normal > f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
206 $ 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
|
207 $ hg tag -l "normal" |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
208 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
209 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
|
210 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
211 $ hg up -Cqr normal= |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
212 $ 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
|
213 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
|
214 1 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
215 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
|
216 (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
|
217 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
218 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
219 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
220 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
221 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
222 $ hg up -Cqr large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
223 $ 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
|
224 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
|
225 0 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
226 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
|
227 (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
|
228 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
229 large |
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 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
|
232 (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
|
233 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
234 $ hg up -Cqr normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
235 $ hg merge -r large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
236 local changed f which remote deleted |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
237 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
|
238 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
|
239 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
|
240 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
|
241 1 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
242 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
|
243 (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
|
244 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
245 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
246 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
247 $ hg up -Cqr normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
248 $ ( 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
|
249 local changed f which remote deleted |
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
|
250 use (c)hanged version or (d)elete? c |
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
|
251 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
|
252 use (l)argefile or keep (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
|
253 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
|
254 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
|
255 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
|
256 (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
|
257 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
258 normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
259 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
260 $ hg up -Cqr normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
261 $ 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
|
262 local changed f which remote deleted |
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
|
263 use (c)hanged version or (d)elete? d |
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
|
264 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
|
265 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
|
266 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
|
267 (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
|
268 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
269 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
270 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
271 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
272 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
273 $ hg up -Cqr large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
274 $ hg merge -r normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
275 remote changed f which local deleted |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
276 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
|
277 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
|
278 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
|
279 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
|
280 1 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
281 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
|
282 (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
|
283 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
284 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
285 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
286 $ hg up -Cqr large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
287 $ ( 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
|
288 remote changed f which local deleted |
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
|
289 use (c)hanged version or leave (d)eleted? c |
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
|
290 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
|
291 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
|
292 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
|
293 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
|
294 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
|
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 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
297 normal2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
298 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
299 $ hg up -Cqr large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
300 $ 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
|
301 remote changed f which local deleted |
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
|
302 use (c)hanged version or leave (d)eleted? d |
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
|
303 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
|
304 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
|
305 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
|
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 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
308 large |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
309 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
310 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
|
311 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
312 $ hg up -Cqr large= |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
313 $ 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
|
314 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
|
315 0 largefiles updated, 0 removed |
19966
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, 1 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 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
322 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
323 $ hg up -Cqr normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
324 $ hg merge -r large= |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
325 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
|
326 (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
|
327 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
328 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
329 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
330 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
|
331 (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
|
332 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
333 $ hg up -Cqr large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
334 $ hg merge -r normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
335 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
|
336 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
|
337 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
|
338 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
|
339 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
|
340 1 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
341 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
|
342 (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
|
343 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
344 large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
345 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
346 $ hg up -Cqr large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
347 $ 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
|
348 local changed .hglf/f which remote deleted |
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
|
349 use (c)hanged version or (d)elete? d |
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
|
350 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
|
351 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
|
352 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
|
353 (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
|
354 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
355 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
356 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
357 swap |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
358 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
359 $ hg up -Cqr normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
360 $ hg merge -r large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
361 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
|
362 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
|
363 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
|
364 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
|
365 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
|
366 1 largefiles updated, 0 removed |
19966
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
367 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
|
368 (branch merge, don't forget to commit) |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
369 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
370 large2 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
371 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
372 $ hg up -Cqr normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
373 $ 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
|
374 remote changed .hglf/f which local deleted |
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
|
375 use (c)hanged version or leave (d)eleted? d |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22288
diff
changeset
|
376 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
|
377 (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
|
378 $ cat f |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
379 normal |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
380 |
7985e3469f58
largefiles: systematic testing of merges to/from largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
19954
diff
changeset
|
381 $ cd .. |