octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: hg repo corruption -- anyone have a backup?


From: Daniel J Sebald
Subject: Re: hg repo corruption -- anyone have a backup?
Date: Fri, 31 Aug 2012 15:40:03 -0500
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.24) Gecko/20111108 Fedora/3.1.16-1.fc14 Thunderbird/3.1.16

On 08/31/2012 03:21 PM, Daniel J Sebald wrote:
On 08/31/2012 02:49 PM, Daniel J Sebald wrote:

Here is the graph right around that time period:

http://hg.savannah.gnu.org/hgweb/octave/graph/a2c74b5c02de

Notice there is a "Merge with dev" followed by a "New gui branch". (And
then there is a "Close bitbucket default branch".) If I'm following
correctly, the "Close bitbucket default branch" ends because the branch
was closed. But why does the "New gui branch" just end? Is there
something there that hasn't yet been merged with the whole default tree,
because it was merged with the bitbucket default branch and then left
unfinished?

My guess is that although "Close bitbucket default branch" closed off

http://hg.savannah.gnu.org/hgweb/octave/graph/f0daeb0eab45

Jacob actually continued development with all those GUI changes in the
parent paths and at a later time merged all those changes. That may be
why there are file revisions pointing to the middle of that branch. But
because "bitbucket default branch" was closed, mercurial isn't expecting
there to be any links along that path.

So really, it may not be that the repository is actually corrupt, so
much as confused. That is, the links are correct, but things weren't
merged properly.

Oh! Looking at the merge statement "Merge with dev" statement, I wonder if the intention was to merge the gui with the default development branch then close off the bitbucket branch, then start a new gui branch. However, the gui changes were inadvertently merged with bitbucket branch instead then closed.

Is there a way to reopen bitbucket branch and merge it with default development? Try that on a temporary clone.

Dan


reply via email to

[Prev in Thread] Current Thread [Next in Thread]