Not updating since new heads added
(21 minutes ago by Steve Losh) See how we have two separate graphs?
Changesets 0 to 3 are linked, and changesets 4 to 6 are linked. This should be trivial because we’ve organized the folder structure beforehand so there won’t be any conflicts: $ hg update 6 2 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg merge 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg commit -m 'Combine the source and docs repositories.' $ hg glog @ 7 Combine the source and docs repositories.
I'm currently working around this by using --changesfile and working out explicitly which CL's need to be imported.
(26 minutes ago by Steve Losh) | | | o 4 Add a README file.