Problem with mozilla-central repository multiple heads

[Ricardo Palomares Martí­nez]

Hi,

This morning I ran in my local comm-central repository the usual order
to update locales:

[comm-central $] python client.py checkout

The comm-central part updated successfully as usual, but as the script
ran hg pull on the mozilla-central imported repository, I suddenly was
presented with a three-versions diff to solve the differences.
Although I scratched my bald head, I went into the merging with that
file and saved. Then, I got it another file, which turned to be a
100,000 lines file. Every decission about the merging took 15-20
seconds and finally I had to go out and now, after spending some more
time, I've resigned.

Now I wish to start over. I'd say that it should suffice if I just
delete the entire mozilla/ directory inside comm-central and run again
"python client.py checkout", but I'd like to get some confirmation
before doing it, to avoid messing it even more. :-)

TIA

[Asrail]

Ricardo Palomares Martí­nez, 18-10-2008 17:40:

Have you commited (hg commit) after merging?
If yes, have you commited more than once?

If you answer "no" to some of the questions, you can do on "mozilla/":
$ hg revert --all
$ hg rollback
$ hg revert --all

Then:
$ hg up -r default

Otherwise... if you have no work on the directory, you can safely remove
it and run client.py again.
You can even use the mozcentral bundle also.

There are other options, as cloning the "mozilla/" directory as of some
safe revision, replacing the directory with the clone, change some
variables (telling the default pull and default push) and updating it to
"-r default".

The three choices are ordered in order of complexity and inverse order
of bandwidth use.
If you don't care much about bandwidth, you can just remove the directory.

[Ricardo Palomares Martí­nez]

Asrail escribió:

>
> Have you commited (hg commit) after merging?
> If yes, have you commited more than once?

As a localizer, I don't ever commit on comm-central and
mozilla-central, just on my l10n-central/ab-CD (which happens to be
es-ES).

> Otherwise... if you have no work on the directory, you can safely remove
> it and run client.py again.

I'll do this, as I think it is the safest option, thank you very much.
I'm still somewhat puzzled about why those changes took place (none of
the conflicting files were localization files).

Ricardo.

[Asrail]

Ricardo Palomares Martí­nez, 18-10-2008 18:28:

> I'll do this, as I think it is the safest option, thank you very much.
> I'm still somewhat puzzled about why those changes took place (none of
> the conflicting files were localization files).

There are a lot of heads right now on mozilla-central.
By coincidence, you've run client.py while the tip was on a different
head, so there was a conflict and you was presented that conflict.

The files to merge were between two of the different heads.