Re: [Whoosh] How I messed up the repo
16 views
Skip to first unread message
Matt Billenstein
Dec 14, 2011, 7:01:05 AM12/14/11
to who...@googlegroups.com
On Tue, Dec 13, 2011 at 05:14:42AM -0500, Matt Chaput wrote:
> Unfortunately, I'm still not exactly a Mercurial expert, and didn't plan
> well, so I was committing my experiments to the default branch, so the tip
> was not a "shippable" version. I thought I would be able to move the commits
> into a branch at some point or just push it when it was all done.
> Unfortunately I accidentally pushed the changes to BitBucket at some point,
> so the tip wasn't working. Apologies to everyone who was pulling from the
> repo.
How many commits is it? I'm not fluent in mercurial either, but if it were
git, I'd revert those commits on the master branch to get you back to where you
started, then cut a new branch and revert the reverts there to get you back to
the experimental tip -- it seems a bit backwards, but it makes the merge down
clean vs just reverting in one branch...
m
--
Matt Billenstein
ma...@vazor.com
http://www.vazor.com/
> Unfortunately, I'm still not exactly a Mercurial expert, and didn't plan
> well, so I was committing my experiments to the default branch, so the tip
> was not a "shippable" version. I thought I would be able to move the commits
> into a branch at some point or just push it when it was all done.
> Unfortunately I accidentally pushed the changes to BitBucket at some point,
> so the tip wasn't working. Apologies to everyone who was pulling from the
> repo.
How many commits is it? I'm not fluent in mercurial either, but if it were
git, I'd revert those commits on the master branch to get you back to where you
started, then cut a new branch and revert the reverts there to get you back to
the experimental tip -- it seems a bit backwards, but it makes the merge down
clean vs just reverting in one branch...
m
--
Matt Billenstein
ma...@vazor.com
http://www.vazor.com/
Reply all
Reply to author
Forward
0 new messages