Mercurial > hg
annotate tests/test-debugrename.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 | 5d9bc49b0b1e |
children | 55c6ebd11cb9 |
rev | line source |
---|---|
12285
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
1 $ hg init |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
2 $ echo a > a |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
3 $ hg ci -Am t |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
4 adding a |
4637 | 5 |
12285
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
6 $ hg mv a b |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
7 $ hg ci -Am t1 |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
8 $ hg debugrename b |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
9 b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
4637 | 10 |
12285
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
11 $ hg mv b a |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
12 $ hg ci -Am t2 |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
13 $ hg debugrename a |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
14 a renamed from b:37d9b5d994eab34eda9c16b195ace52c7b129980 |
4637 | 15 |
12285
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
16 $ hg debugrename --rev 1 b |
5d9bc49b0b1e
tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents:
4637
diff
changeset
|
17 b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
4637 | 18 |