Mercurial > hg
annotate tests/test-pull-update.t @ 27947:571ba161f6be stable
largefiles: prevent committing a missing largefile
Previously, if the largefile was deleted at the time of a commit, the standin
was silently not updated and its current state (possibly garbage) was recorded.
The test makes it look like this is somewhat of an edge case, but the same thing
happens when an `hg revert` followed by `rm` changes the standin.
Aside from the second invocation of this in lfutil.updatestandinsbymatch()
(which is what triggers this test case), the three other uses are guarded by
dirstate checks for added or modified, or an existence check in the filesystem.
So aborting in lfutil.updatestandins() should be safe, and will avoid silent
skips in the future if this is used elsewhere.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 24 Jan 2016 00:10:19 -0500 |
parents | 216cc65cf227 |
children | 6b1fc09c699a |
rev | line source |
---|---|
12279 | 1 $ hg init t |
2 $ cd t | |
3 $ echo 1 > foo | |
4 $ hg ci -Am m | |
5 adding foo | |
6 | |
7 $ cd .. | |
8 $ hg clone t tt | |
9 updating to branch default | |
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 $ cd tt | |
12 $ echo 1.1 > foo | |
13 $ hg ci -Am m | |
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
14 |
12279 | 15 $ cd ../t |
16 $ echo 1.2 > foo | |
17 $ hg ci -Am m | |
18 | |
19 Should not update: | |
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
20 |
12279 | 21 $ hg pull -u ../tt |
22 pulling from ../tt | |
23 searching for changes | |
24 adding changesets | |
25 adding manifests | |
26 adding file changes | |
27 added 1 changesets with 1 changes to 1 files (+1 heads) | |
26968
216cc65cf227
pull: return 255 value on update failure (issue4948) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
19798
diff
changeset
|
28 abort: not updating: not a linear update |
19798
76df01e56e7f
update: improve error message for clean non-linear update
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
29 (merge or update --check to force update) |
26968
216cc65cf227
pull: return 255 value on update failure (issue4948) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
19798
diff
changeset
|
30 [255] |
12279 | 31 |
32 $ cd ../tt | |
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
33 |
12279 | 34 Should not update: |
35 | |
36 $ hg pull -u ../t | |
37 pulling from ../t | |
38 searching for changes | |
39 adding changesets | |
40 adding manifests | |
41 adding file changes | |
42 added 1 changesets with 1 changes to 1 files (+1 heads) | |
26968
216cc65cf227
pull: return 255 value on update failure (issue4948) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
19798
diff
changeset
|
43 abort: not updating: not a linear update |
19798
76df01e56e7f
update: improve error message for clean non-linear update
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
44 (merge or update --check to force update) |
26968
216cc65cf227
pull: return 255 value on update failure (issue4948) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents:
19798
diff
changeset
|
45 [255] |
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
46 |
12279 | 47 $ HGMERGE=true hg merge |
48 merging foo | |
49 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
50 (branch merge, don't forget to commit) | |
51 $ hg ci -mm | |
52 | |
53 $ cd ../t | |
54 | |
55 Should work: | |
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
56 |
12279 | 57 $ hg pull -u ../tt |
58 pulling from ../tt | |
59 searching for changes | |
60 adding changesets | |
61 adding manifests | |
62 adding file changes | |
63 added 1 changesets with 1 changes to 1 files (-1 heads) | |
64 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
65 | |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
14485
diff
changeset
|
66 $ cd .. |