Mercurial > evolve
comparison tests/test-tutorial.t @ 652:5a929510de9d
merge with filtering change (DO NOT USE WITHOUT FILTERING)
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Fri, 04 Jan 2013 12:43:22 +0100 |
parents | 629ec7f612aa e291e5271694 |
children | c56109c9aebf |
comparison
equal
deleted
inserted
replaced
651:609faf10d307 | 652:5a929510de9d |
---|---|
218 searching for changes | 218 searching for changes |
219 adding changesets | 219 adding changesets |
220 adding manifests | 220 adding manifests |
221 adding file changes | 221 adding file changes |
222 added 1 changesets with 1 changes to 1 files (+1 heads) | 222 added 1 changesets with 1 changes to 1 files (+1 heads) |
223 (run 'hg heads .' to see heads, 'hg merge' to merge) | 223 (run 'hg heads' to see heads, 'hg merge' to merge) |
224 | 224 |
225 I now have a new heads. Note that this remote head is immutable | 225 I now have a new heads. Note that this remote head is immutable |
226 | 226 |
227 $ hg log -G | 227 $ hg log -G |
228 o 9ca060c80d74 (public): SPAM | 228 o 9ca060c80d74 (public): SPAM |
566 searching for changes | 566 searching for changes |
567 adding changesets | 567 adding changesets |
568 adding manifests | 568 adding manifests |
569 adding file changes | 569 adding file changes |
570 added 1 changesets with 1 changes to 1 files (+1 heads) | 570 added 1 changesets with 1 changes to 1 files (+1 heads) |
571 (run 'hg heads .' to see heads, 'hg merge' to merge) | 571 (run 'hg heads' to see heads, 'hg merge' to merge) |
572 1 new unstable changesets | 572 1 new unstable changesets |
573 | 573 |
574 | 574 |
575 The new changeset "animal" is based one an old changeset of "bathroom". You can | 575 The new changeset "animal" is based one an old changeset of "bathroom". You can |
576 see both version showing up in the log. | 576 see both version showing up in the log. |