equal
deleted
inserted
replaced
146 |
146 |
147 $ cd .. |
147 $ cd .. |
148 |
148 |
149 Check that the right ancestors is used while rebasing a merge (issue4041) |
149 Check that the right ancestors is used while rebasing a merge (issue4041) |
150 |
150 |
151 $ hg clone "$TESTDIR/bundles/issue4041.hg" issue4041 |
151 $ hg init issue4041 |
152 requesting all changes |
152 $ cd issue4041 |
|
153 $ hg unbundle "$TESTDIR/bundles/issue4041.hg" |
153 adding changesets |
154 adding changesets |
154 adding manifests |
155 adding manifests |
155 adding file changes |
156 adding file changes |
156 added 11 changesets with 8 changes to 3 files (+1 heads) |
157 added 11 changesets with 8 changes to 3 files (+1 heads) |
157 new changesets 24797d4f68de:2f2496ddf49d |
158 new changesets 24797d4f68de:2f2496ddf49d |
158 updating to branch default |
159 (run 'hg heads' to see heads) |
|
160 $ hg up default |
159 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
161 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
160 $ cd issue4041 |
|
161 $ hg log -G |
162 $ hg log -G |
162 o changeset: 10:2f2496ddf49d |
163 o changeset: 10:2f2496ddf49d |
163 |\ branch: f1 |
164 |\ branch: f1 |
164 | | tag: tip |
165 | | tag: tip |
165 | | parent: 7:4c9fbe56a16f |
166 | | parent: 7:4c9fbe56a16f |