Mercurial > hg
view tests/test-unrelated-pull.out @ 5080:73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Patch written by Benoit Boissinot.
This should probably be improved in the future to handle long-living
branches, as joining two "other" heads will switch to that new head.
But this is not a new problem, as adding to the "other" head would have
switched to that new head, too.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 06 Aug 2007 20:25:50 +0200 |
parents | 8c4fd0de5de8 |
children | 4c94b6d0fb1c |
line wrap: on
line source
pulling from ../a searching for changes abort: repository is unrelated pulling from ../a searching for changes warning: repository is unrelated adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) changeset: 1:bdcee5d51fa6 tag: tip parent: -1:000000000000 user: a date: Mon Jan 12 13:46:40 1970 +0000 summary: a changeset: 0:f155ba1aa5ba user: b date: Mon Jan 12 13:46:40 1970 +0000 summary: b