equal
deleted
inserted
replaced
77 | |
77 | |
78 x cc71ffbc7c00 (1) add foo.txt |
78 x cc71ffbc7c00 (1) add foo.txt |
79 rewritten(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
79 rewritten(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
80 rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
80 rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
81 |
81 |
82 $ hg evolve --content-divergent 2>&1 | grep '^\S' |
82 $ hg evolve --content-divergent |
83 merge:[6] add foo.txt |
83 merge:[6] add foo.txt |
84 with: [4] add foo.txt |
84 with: [4] add foo.txt |
85 base: [1] add foo.txt |
85 base: [1] add foo.txt |
86 rebasing "other" content-divergent changeset c17bf400a278 on c17bf400a278 |
86 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
87 ** unknown exception encountered, please report by visiting |
87 1 new orphan changesets |
88 ** https://mercurial-scm.org/wiki/BugTracker |
88 working directory is now at 2372e6d39855 |
89 ** Python * (glob) |
|
90 ** Mercurial Distributed SCM (*) (glob) |
|
91 ** Extensions loaded: rebase, evolve |
|
92 ** ProgrammingError: tried to relocate a node on top of itself |
|
93 ** (This shouldn't happen. If you still need to move changesets, please do so manually with nothing to rebase - working directory parent is also destination) |
|
94 Traceback (most recent call last): |
|
95 mercurial.error.ProgrammingError: tried to relocate a node on top of itself |
|