Mercurial > hg
annotate tests/test-pull-permission.t @ 38679:b3d0c97a0820
rebase: in --confirm option just abort if hit a conflict
Before this patch, it was prompting the user in both cases 1) when
there is no conflict 2) when there is at least one conflict. But
for simplicity we can just abort if we hit a conflict and no need to
prompt in that case.
Differential Revision: https://phab.mercurial-scm.org/D3944
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 14 Jul 2018 08:59:42 +0530 |
parents | eb586ed5d8ce |
children | f1186c292d03 |
rev | line source |
---|---|
22047
8fb6844a4ff1
tests: change some #ifs to #requires
Matt Mackall <mpm@selenic.com>
parents:
20008
diff
changeset
|
1 #require unix-permissions no-root |
15516
10f302f5e9f6
tests: add missing 'hghave unix-permissions'
Mads Kiilerich <mads@kiilerich.com>
parents:
13956
diff
changeset
|
2 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12279
diff
changeset
|
3 $ hg init a |
12279 | 4 $ cd a |
5 $ echo foo > b | |
6 $ hg add b | |
7 $ hg ci -m "b" | |
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
8 |
12279 | 9 $ chmod -w .hg/store |
10 | |
11 $ cd .. | |
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
12 |
12279 | 13 $ hg clone a b |
14 requesting all changes | |
15 adding changesets | |
16 adding manifests | |
17 adding file changes | |
18 added 1 changesets with 1 changes to 1 files | |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
22047
diff
changeset
|
19 new changesets 97310831fa1a |
12279 | 20 updating to branch default |
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
22 |
12279 | 23 $ chmod +w a/.hg/store # let test clean up |
1750
955a7caf005c
make test-pull-permission cleanup correctly in case of errors
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1244
diff
changeset
|
24 |
12279 | 25 $ cd b |
26 $ hg verify | |
27 checking changesets | |
28 checking manifests | |
29 crosschecking files in changesets and manifests | |
30 checking files | |
31 1 files, 1 changesets, 1 total revisions | |
1750
955a7caf005c
make test-pull-permission cleanup correctly in case of errors
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1244
diff
changeset
|
32 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15516
diff
changeset
|
33 $ cd .. |