[Buildbot-devel] Questions on source step's clobbering

[Axel Hecht]

I'd recommend doing the following:

hg pull (1)
hg update -C -r branch (default to default)
patch.

(1) Note, hg versions prior to 1.1 may run into race conditions on pull. hg
pull -r tip works around the race condition, but doesn't pull all heads on
all branches. In this particular case, you might be able to actually pull -r
given_branch. For branches, that should work, for tags not, though. The
pulled clone by revision doesn't have the changeset which actually adds the
tag to hgtags, so the remote clone is on the right revision, but doesn't
have the tag information to confirm that. One way to work around this is to
actually pull the branch, and update to revision on that branch. That should
work at least as long as there is only one head per branch. It might be a
good idea to get the hg version on the slave to only jump through these
loops for versions older than 1.1. Or you make the source class just clobber
on error, that might be a good idea anyhow.

The hg ticket in question is http://www.selenic.com/mercurial/bts/issue1320btw.

Axel

2008/12/30 Marcus Lindblom <macke at yar.nu>

> Hi,
>
> I'm working on a test case for http://buildbot.net/trac/ticket/187 and
> have stumbled on the clobber detection.
>
> The test seems to say that patches against the same branch should not
> clobber, (and leave the previous files in place) but updated toward a
> different branch should clobber?
>
> It seems as if the "regular" vc:s just fail if one tries to switch
> branch with 'other' files in the way, thus triggering a clobber. This
> does not happen with hg, so my test fails.
>
> I tried to detect this by doing 'hg status' but that always clobbers and
> then the test fails because it expects these extra files to be kept.
>
> Is it necessary to keep files?
>
> Does anyone know a good way to fix this with hg?
>
> (In general, I've found buildbot to be a bit vague on the concepts of
> revisions, branches and 'just the latest', having used it with
> subversion previously.)
>
> Cheers,
> /Marcus
>
>
>
> ------------------------------------------------------------------------------
> _______________________________________________
> Buildbot-devel mailing list
> Buildbot-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/buildbot-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://buildbot.net/pipermail/devel/attachments/20081231/fc7df4a2/attachment.html>