Bug report

[Dennis Brakhane]

Am 21.11.2010 01:00, schrieb Dennis Brakhane:
Just to make it clearer, it should look like this:
>
>                 - A4 - A5 - A6 - ... - An ----------------
>               /                                           \
> A1 - A2 - A3                                - Bn+1 - Bn+2    - merge - Bn+2
>               \
>                 - B4 - B5 - B6 - ... - Bn /
> 
And one correction:
> 
> 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.

cs 35 does actually contain cantroid_d, while 207 does not!
This is why they differ. I will try to reproduce this with a minimal
test case.

-------------- 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/3e1b5a1a/attachment.pgp>