Attention: stripped from crew-stable

Stuart W. Marks smarks at smarks.org
Fri Aug 7 12:32:03 CDT 2009


Yes, thanks for the warning. I wondered "gee, there are a lot of changes to 
stable" when I pulled last night and got:

added 171 changesets with 303 changes to 133 files
133 files updated, 0 files merged, 0 files removed, 0 files unresolved

Following Jesper's suggestion, though, left my crew-stable clone with two 
heads. The tip was of course the same as crew-stable, but the branch leading to 
the second head consisted of all the "extra" changesets. This makes the output 
of "hg outgoing" quite confusing.

The solution I found was to strip all of changesets reported by "outgoing" 
which can be done easily in this case by stripping starting at the first 
outgoing changeset. For me, this was ada93c6bf554. Thus:

$ hg strip ada93c6bf554
$ hg pull -u

This left my crew-stable clone identical to crew-stable, with no incoming nor 
outgoing changesets.

Of course, probably the safest thing to do is to blow away one's crew-stable 
clone and simple create a fresh one.

s'marks

Jesper Nøhr wrote:
> Thanks for the warning.
> 
> What we did to get it back in sync on Bitbucket, was to issue:
> 
> $ hg strip fb66a7d3f28f
> $ hg pull -u
> 
> 
> Jesper
> 
> 
> 
> On Fri, Aug 7, 2009 at 10:47 AM, Dirkjan Ochtman<dirkjan at ochtman.nl> wrote:
>> For those who track crew-stable: approximately 6 hours ago, one of the
>> crew members pushed the entirety of crew into crew-stable. The
>> changesets which don't belong there have since been stripped, but if
>> you pulled from crew-stable in the interim (or have scripts doing that
>> on a regular basis), you may want to check that you don't have all
>> that stuff sitting in there.
>>
>> Sorry for the inconvenience,
>>
>> Dirkjan
>> _______________________________________________
>> Mercurial mailing list
>> Mercurial at selenic.com
>> http://selenic.com/mailman/listinfo/mercurial
>>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
> 


More information about the Mercurial-devel mailing list