Mercurial > hg
comparison tests/test-issue1175.t @ 12195:ee41be2bbf5a
tests: unify test-issue*
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 03 Sep 2010 23:34:37 +0200 |
parents | tests/test-issue1175@0d714a48ab53 |
children | b63f6422d2a7 |
comparison
equal
deleted
inserted
replaced
12194:9e40ea08c2ab | 12195:ee41be2bbf5a |
---|---|
1 # http://mercurial.selenic.com/bts/issue1175 | |
2 | |
3 $ hg init | |
4 $ touch a | |
5 $ hg ci -Am0 | |
6 adding a | |
7 | |
8 $ hg mv a a1 | |
9 $ hg ci -m1 | |
10 | |
11 $ hg co 0 | |
12 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
13 | |
14 $ hg mv a a2 | |
15 $ hg up | |
16 warning: detected divergent renames of a to: | |
17 a2 | |
18 a1 | |
19 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
20 | |
21 $ hg ci -m2 | |
22 | |
23 $ touch a | |
24 $ hg ci -Am3 | |
25 adding a | |
26 | |
27 $ hg mv a b | |
28 $ hg ci -Am4 a | |
29 | |
30 $ hg ci --debug --traceback -Am5 b | |
31 b | |
32 b: searching for copy revision for a | |
33 b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db | |
34 committed changeset 5:89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b | |
35 | |
36 $ hg verify | |
37 checking changesets | |
38 checking manifests | |
39 crosschecking files in changesets and manifests | |
40 checking files | |
41 4 files, 6 changesets, 4 total revisions | |
42 | |
43 $ hg export --git tip | |
44 # HG changeset patch | |
45 # User test | |
46 # Date 0 0 | |
47 # Node ID 89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b | |
48 # Parent 7fc86ba705e717a721dbc361bf8c9bc05a18ca2f | |
49 5 | |
50 | |
51 diff --git a/b b/b | |
52 new file mode 100644 | |
53 |