Common ancestor between repositories
Greg Ward
greg-hg at gerg.ca
Fri Jun 4 20:22:31 UTC 2010
On Fri, Jun 4, 2010 at 3:25 PM, Gunnison, Brian
<brian.gunnison at intel.com> wrote:
> Does your scenario cover the case that MR has accumulated different changes than WR and BR does not want these?
It should, yes. As long as you clone MR to BR and *then* apply
tryme.bundle (from WR), the heads from WR will be later (higher rev
nums) than the heads from MR. And "hg update" will generally take you
to the latest head of the current branch. Hmmm: cross-branch updates
won't work. So you could either 1) use "hg clone -U MR WR" and do not
update until you have applied the bundle or 2) use "hg update -C"
after applying the bundle. That's generally dangerous (-C
unconditionally discards uncommitted changes in the working dir), but
you should not have uncomitted changes in the working dir used by a
build server.
Greg
More information about the Mercurial
mailing list