equal
deleted
inserted
replaced
28 $ hg ci -Am4 a |
28 $ hg ci -Am4 a |
29 |
29 |
30 $ hg ci --debug --traceback -Am5 b |
30 $ hg ci --debug --traceback -Am5 b |
31 committing files: |
31 committing files: |
32 b |
32 b |
33 b: searching for copy revision for a |
33 warning: can't find ancestor for 'b' copied from 'a'! |
34 b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db |
|
35 committing manifest |
34 committing manifest |
36 committing changelog |
35 committing changelog |
37 committed changeset 5:732aafbecb501a198b3cc9323ad3899ff04ccf95 |
36 committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1 |
38 |
37 |
39 $ hg verify |
38 $ hg verify |
40 checking changesets |
39 checking changesets |
41 checking manifests |
40 checking manifests |
42 crosschecking files in changesets and manifests |
41 crosschecking files in changesets and manifests |
46 $ hg export --git tip |
45 $ hg export --git tip |
47 # HG changeset patch |
46 # HG changeset patch |
48 # User test |
47 # User test |
49 # Date 0 0 |
48 # Date 0 0 |
50 # Thu Jan 01 00:00:00 1970 +0000 |
49 # Thu Jan 01 00:00:00 1970 +0000 |
51 # Node ID 732aafbecb501a198b3cc9323ad3899ff04ccf95 |
50 # Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1 |
52 # Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f |
51 # Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f |
53 5 |
52 5 |
54 |
53 |
55 diff --git a/b b/b |
54 diff --git a/b b/b |
56 new file mode 100644 |
55 new file mode 100644 |
57 |
56 |
|
57 http://bz.selenic.com/show_bug.cgi?id=4476 |
|
58 |
|
59 $ hg init foo |
|
60 $ cd foo |
|
61 $ touch a && hg ci -Aqm a |
|
62 $ hg mv a b |
|
63 $ echo b1 >> b |
|
64 $ hg ci -Aqm b1 |
|
65 $ hg up 0 |
|
66 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
67 $ hg mv a b |
|
68 $ echo b2 >> b |
|
69 $ hg ci -Aqm b2 |
|
70 $ hg graft 1 |
|
71 grafting 1:5974126fad84 "b1" |
|
72 merging b |
|
73 warning: conflicts during merge. |
|
74 merging b incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
75 abort: unresolved conflicts, can't continue |
|
76 (use hg resolve and hg graft --continue) |
|
77 [255] |
|
78 $ echo a > b |
|
79 $ echo b3 >> b |
|
80 $ hg resolve --mark b |
|
81 (no more unresolved files) |
|
82 $ hg graft --continue |
|
83 grafting 1:5974126fad84 "b1" |
|
84 warning: can't find ancestor for 'b' copied from 'a'! |
|
85 $ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n' |
|
86 changeset: 3:376d30ccffc0 |
|
87 summary: b1 |
|
88 |
|
89 changeset: 2:416baaa2e5e4 |
|
90 summary: b2 |
|
91 |
|
92 changeset: 0:3903775176ed |
|
93 summary: a |
|
94 |
|
95 |
|
96 |