Show More
@@ -1,96 +1,96 b'' | |||
|
1 | 1 | https://bz.mercurial-scm.org/1175 |
|
2 | 2 | |
|
3 | 3 | $ hg init |
|
4 | 4 | $ touch a |
|
5 | 5 | $ hg ci -Am0 |
|
6 | 6 | adding a |
|
7 | 7 | |
|
8 | 8 | $ hg mv a a1 |
|
9 | 9 | $ hg ci -m1 |
|
10 | 10 | |
|
11 | 11 | $ hg co 0 |
|
12 | 12 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
13 | 13 | |
|
14 | 14 | $ hg mv a a2 |
|
15 | 15 | $ hg up |
|
16 | 16 | note: possible conflict - a was renamed multiple times to: |
|
17 | 17 | a2 |
|
18 | 18 | a1 |
|
19 | 19 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
20 | 20 | |
|
21 | 21 | $ hg ci -m2 |
|
22 | 22 | |
|
23 | 23 | $ touch a |
|
24 | 24 | $ hg ci -Am3 |
|
25 | 25 | adding a |
|
26 | 26 | |
|
27 | 27 | $ hg mv a b |
|
28 | 28 | $ hg ci -Am4 a |
|
29 | 29 | |
|
30 | 30 | $ hg ci --debug --traceback -Am5 b |
|
31 | 31 | committing files: |
|
32 | 32 | b |
|
33 | 33 | warning: can't find ancestor for 'b' copied from 'a'! |
|
34 | 34 | committing manifest |
|
35 | 35 | committing changelog |
|
36 | 36 | committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1 |
|
37 | 37 | |
|
38 | 38 | $ hg verify |
|
39 | 39 | checking changesets |
|
40 | 40 | checking manifests |
|
41 | 41 | crosschecking files in changesets and manifests |
|
42 | 42 | checking files |
|
43 | 43 | 4 files, 6 changesets, 4 total revisions |
|
44 | 44 | |
|
45 | 45 | $ hg export --git tip |
|
46 | 46 | # HG changeset patch |
|
47 | 47 | # User test |
|
48 | 48 | # Date 0 0 |
|
49 | 49 | # Thu Jan 01 00:00:00 1970 +0000 |
|
50 | 50 | # Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1 |
|
51 | 51 | # Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f |
|
52 | 52 | 5 |
|
53 | 53 | |
|
54 | 54 | diff --git a/b b/b |
|
55 | 55 | new file mode 100644 |
|
56 | 56 | |
|
57 |
http://bz. |
|
|
57 | https://bz.mercurial-scm.org/show_bug.cgi?id=4476 | |
|
58 | 58 | |
|
59 | 59 | $ hg init foo |
|
60 | 60 | $ cd foo |
|
61 | 61 | $ touch a && hg ci -Aqm a |
|
62 | 62 | $ hg mv a b |
|
63 | 63 | $ echo b1 >> b |
|
64 | 64 | $ hg ci -Aqm b1 |
|
65 | 65 | $ hg up 0 |
|
66 | 66 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
67 | 67 | $ hg mv a b |
|
68 | 68 | $ echo b2 >> b |
|
69 | 69 | $ hg ci -Aqm b2 |
|
70 | 70 | $ hg graft 1 |
|
71 | 71 | grafting 1:5974126fad84 "b1" |
|
72 | 72 | merging b |
|
73 | 73 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
|
74 | 74 | abort: unresolved conflicts, can't continue |
|
75 | 75 | (use 'hg resolve' and 'hg graft --continue') |
|
76 | 76 | [255] |
|
77 | 77 | $ echo a > b |
|
78 | 78 | $ echo b3 >> b |
|
79 | 79 | $ hg resolve --mark b |
|
80 | 80 | (no more unresolved files) |
|
81 | 81 | continue: hg graft --continue |
|
82 | 82 | $ hg graft --continue |
|
83 | 83 | grafting 1:5974126fad84 "b1" |
|
84 | 84 | warning: can't find ancestor for 'b' copied from 'a'! |
|
85 | 85 | $ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n' |
|
86 | 86 | changeset: 3:376d30ccffc0 |
|
87 | 87 | summary: b1 |
|
88 | 88 | |
|
89 | 89 | changeset: 2:416baaa2e5e4 |
|
90 | 90 | summary: b2 |
|
91 | 91 | |
|
92 | 92 | changeset: 0:3903775176ed |
|
93 | 93 | summary: a |
|
94 | 94 | |
|
95 | 95 | |
|
96 | 96 |
General Comments 0
You need to be logged in to leave comments.
Login now