Mercurial > hg
annotate tests/test-empty-dir.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 | 3b165c127690 |
children |
rev | line source |
---|---|
12158
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
1 $ hg init |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
2 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
3 $ echo 123 > a |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
4 $ hg add a |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
5 $ hg commit -m "first" a |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
6 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
7 $ mkdir sub |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
8 $ echo 321 > sub/b |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
9 $ hg add sub/b |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
10 $ hg commit -m "second" sub/b |
578 | 11 |
12158
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
12 $ cat sub/b |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
13 321 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
14 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
15 $ hg co 0 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
16 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
578 | 17 |
12158
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
18 $ cat sub/b 2>/dev/null || echo "sub/b not present" |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
19 sub/b not present |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
20 |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
21 $ test -d sub || echo "sub not present" |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
22 sub not present |
019cd2826d21
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
23 |