Bug report

Dennis Brakhane brakhane at googlemail.com
Sat Nov 20 18:00:06 CST 2010


Am 21.11.2010 00:39, schrieb Patrick Mézard:
> Le 20/11/10 22:59, Tobias Dammers a écrit : This is caused by an
> attempt to copy admin/MapEdit.html from templates/map_edit.html.
> Looking at the history and the filemap I do not see why this would be
> a problem. What's suspect is the revision where it happens seems to
> have a duplicate in the history.
> 
> changeset:   228:9e509514bb87 user:        Tobias Dammers
> <tdammers at gmail.com> date:        Tue Sep 28 13:33:03 2010 +0200 
> summary:     Refactoring: move template into same dir as codebehind;
> changed naming conventions; added BaseWebControl
> 
> changeset:   57:52cccf41a04a user:        Tobias Dammers
> <tdammers at gmail.com> date:        Tue Sep 28 13:33:03 2010 +0200 
> summary:     Refactoring: move template into same dir as codebehind;
> changed naming conventions; added BaseWebControl
> 
> Perhaps that's the case of many other revisions, I haven't checked
> yet.

Nice catch! Actually, it seems like there is a ton of duplicate
revisions. It looks like this:



                - A4 - A5 - A6 - ... --------------
              /                                      \
A1 - A2 - A3                           - Bn - Bn+1     - merge - Bn+2
              \
                - B4 - B5 - B6 - ... /


Actually, A4 == B4, A5 == B5, only the changeset hashes are different.
Which is odd, since identical changsets with should have identical
changeset ids...

The first changeset (A4 and B4 in the above picture) are these:

changeset:   35:dc06e742dc08
user:        Tobias Dammers <tdammers at gmail.com>
date:        Sat Sep 04 16:04:29 2010 +0200
summary:     Updated location / path data

changeset:   207:264310a065dd
parent:      34:33478e0a3fdc
user:        Tobias Dammers <tdammers at gmail.com>
date:        Sat Sep 04 16:04:29 2010 +0200
summary:     Updated location / path data

Which interestingly removed(!) "dbgen/cantroid_d.json" from .hgignore
and therefore actually added it to the repo.



-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 554 bytes
Desc: OpenPGP digital signature
URL: <http://selenic.com/pipermail/mercurial/attachments/20101121/eb6f2f6c/attachment.pgp>


More information about the Mercurial mailing list