Mercurial > hg
annotate tests/test-debugrename.t @ 26519:48476c6129a2
filemerge: run symlink check for :merge3
Just like :merge, :merge3 doesn't support merging symlinks.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 07 Oct 2015 00:27:23 -0700 |
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 |