Launchpad itself

please reconcile vcs-import lp:xiphos

Asked by Dimitri John Ledkov

lp:xiphos is svn import

please do $ bzr reconcile lp:xiphos

When trying to do it myself I get permission error on creating branch lock.

There are 55 inconsistent parents which get fixed by reconcile.

There are also 4 ghost revisions.
I've pushed 2 of those as lp:~dmitrij.ledkov/xiphos/ghost1 and lp:~dmitrij.ledkov/xiphos/ghost2

Can you $ bzr fetch-ghosts these two branches into lp:xiphos?
Or how do I fix the actual svn trunk?

Thanks.

Question information

Language:
English Edit question
Status:
Solved
For:
Launchpad itself Edit question
Assignee:
No assignee Edit question
Solved by:
Jelmer Vernooij
Solved:
Last query:
Last reply:
Revision history for this message
Jelmer Vernooij (jelmer) said : 		#1

On Tue, 2010-04-27 at 16:59 +0000, Dmitrijs Ledkovs wrote:
> New question #108563 on Launchpad Bazaar Integration:
> https://answers.edge.launchpad.net/launchpad-code/+question/108563
>
> lp:xiphos is svn import
>
> please do $ bzr reconcile lp:xiphos
>
> When trying to do it myself I get permission error on creating branch lock.
>
> There are 55 inconsistent parents which get fixed by reconcile.
>
> There are also 4 ghost revisions.
> I've pushed 2 of those as lp:~dmitrij.ledkov/xiphos/ghost1 and lp:~dmitrij.ledkov/xiphos/ghost2
>
> Can you $ bzr fetch-ghosts these two branches into lp:xiphos?
> Or how do I fix the actual svn trunk?
 fetch-ghosts will only work if the revisions are actually present in the
svn repository. If you've used bzr push to push to a svn repo you
wouldn't get the right hand side revisions by default, unless you have
set push_merged_revisions = True.

Cheers,

Jelmer

Revision history for this message
Dimitri John Ledkov (xnox) said : 		#2

1) Can I push merged revisions post-mortem to svn using bzr-svn? e.g. these 4 missing revisions were pushed in December 2009?

2) Can launchpad admins still run reconcile on the branch to get the parents right? or are parents missing on 54 revisions because of the ghost revisions?

Revision history for this message
Dimitri John Ledkov (xnox) said : 		#3

I'm re-reading $ bzr check -v those 54 missing parents all refer to the ghost...

So no need to run reconcile on launchpad. I just hope I can still push missing revisions to svn =/

Revision history for this message
Best Jelmer Vernooij (jelmer) said : 		#4

On Tue, 2010-04-27 at 23:50 +0000, Dmitrijs Ledkovs wrote:
> 1) Can I push merged revisions post-mortem to svn using bzr-svn? e.g.
> these 4 missing revisions were pushed in December 2009?
 Yeah, you should be able to push them though bzr-svn will probably not
 pick them up in all situations (it assumes ancestors are pushed
 earlier, which I think is a fair assumption to make).

> 2) Can launchpad admins still run reconcile on the branch to get the
> parents right? or are parents missing on 54 revisions because of the
> ghost revisions?
Newer versions of bzr-svn (from trunk) should probably set better
parents.

Cheers,

Jelmer

Revision history for this message
Dimitri John Ledkov (xnox) said : 		#5

Thanks Jelmer Vernooij, that solved my question.