problem merging deleted file

Matt Mackall mpm at selenic.com
Thu Sep 15 16:17:51 CDT 2005


On Thu, Sep 15, 2005 at 03:53:12PM -0500, Hollis Blanchard wrote:
> On Thursday 15 September 2005 13:35, Matt Mackall wrote:
> > On Thu, Sep 15, 2005 at 12:25:45PM -0500, Hollis Blanchard wrote:
> > > On Thursday 15 September 2005 12:11, Matt Mackall wrote:
> > > > On Thu, Sep 15, 2005 at 11:28:21AM -0500, Hollis Blanchard wrote:
> > > > > Hi, I'm working with this repository:
> > > > > http://xenbits.xensource.com/ext/xenppc-unstable.hg
> > > > >
> > > > > I pull from http://xenbits.xensource.com/xen-unstable.hg (which is my
> > > > > upstream) and then hg update -m. I get this message:
> > > > > 	 local changed xen/arch/ia64/xenasm.S which remote deleted
> > > > > 	(k)eep or (d)elete?
> > > > >
> > > > > This is odd because I haven't modified xen/arch/ia64/xenasm.S, and hg
> > > > > log and hg status confirm that.
> > > >
> > > > Please send the output of hg update -m --debug.
> > >
> > > resolving manifests
> > >  force None allow 1 moddirstate True linear False
> > >  ancestor 014d47e807e4 local aafbc3f2dd1b remote f95061245254
> >
> > Ok, now use this to figure out what file revisions are actually being
> > compared:
> >
> > hg manifest 014d47e807e4 | grep xenasm.S # ancestor
> 98955622ac128c95361b0cdedc4e29697d4a05ee 644 xen/arch/ia64/xenasm.S
> 
> > hg manifest aafbc3f2dd1b | grep xenasm.S # local
> bb8b9efa4b80c51fc29b1e5ae5cc8974e7d3b3e6 644 xen/arch/ia64/xenasm.S
> 
> > hg manifest f95061245254 | grep xenasm.S # remote
> f5597be08a149ef2bf8635c4641a971c5027f1d0 644 xen/arch/ia64/xen/xenasm.S
> 
> > I suspect we'll see local different from ancestor and no entry for remote.
> 
> Hmm, there is an entry for remote...

Note the different path. So far everything looks correct. Your local
copy is different from the common ancestor.

> > hg debugindex .hg/data/xen/arch/ia64/xenasm.S.i
..
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0    3445      0    3086 90881086be6b 000000000000 000000000000
     1      3445       0      0    3088 031199d85f4d 000000000000 90881086be6b
     2      3445       0      0    3094 736d90588383 000000000000 031199d85f4d
     3      3445       0      0    3762 29d92b7cee1c 000000000000 736d90588383
     4      3445     344      0    3833 860d75b39df1 29d92b7cee1c 000000000000
     5      3789       0      0    3834 f8cfafa6f6b6 29d92b7cee1c 860d75b39df1
     6      3789     215      0    3967 e12e53097b51 f8cfafa6f6b6 000000000000
     7      4004       0      0    3968 0984d0f28543 f8cfafa6f6b6 e12e53097b51
     8      4004       0      0    3997 374085e032dd f8cfafa6f6b6 0984d0f28543
     9      4004       0      0    3998 d44ff4845542 f8cfafa6f6b6 374085e032dd
    10      4004      24      0    4137 773273ea8a76 d44ff4845542 000000000000
    11      4028       0      0    4146 82577d56a836 d44ff4845542 773273ea8a76
    12      4028       0      0    4293 527600ae7aaf d44ff4845542 82577d56a836
    13      4028     234      0    4312 cb9fa9f89e5e f8cfafa6f6b6 d44ff4845542
    14      4262     206      0    4375 9d520ba6323c 527600ae7aaf 000000000000
    15      4468      66      0    4437 bf2a7bf1845b 9d520ba6323c 000000000000
    16      4534      67      0    4438 c1e5971add2c 527600ae7aaf 9d520ba6323c
    17      4601      66      0    4439 8a40d7da847a c1e5971add2c bf2a7bf1845b
    18      4667       0      0    4456 5d0581ad9ea0 cb9fa9f89e5e 8a40d7da847a
    19      4667     201      0    4506 984880b65dce 5d0581ad9ea0 000000000000
    20      4868       0      0    4507 4652dff7e217 5d0581ad9ea0 984880b65dce
    21      4868      34      0    4524 223042fefaf8 4652dff7e217 000000000000
    22      4902      69      0    4534 1571ee6713a0 223042fefaf8 000000000000
    23      4971       0      0    4577 13a39c91e3a4 5d0581ad9ea0 1571ee6713a0
    24      4971       0      0    4581 75fc038de8b3 5d0581ad9ea0 13a39c91e3a4
    25      4971      12      0    4662 006cc33b6c4e 13a39c91e3a4 000000000000
    26      4983       0      0    4737 84d4aad1f6d0 75fc038de8b3 006cc33b6c4e
    27      4983       0      0    4740 5875935689a9 75fc038de8b3 84d4aad1f6d0
    28      4983     478      0    5979 70375b75a93c 5875935689a9 000000000000
    29      5461       0      0    5983 ce172f3a8c12 70375b75a93c 5875935689a9
    30      5461       0      0    5987 92f58781e998 ce172f3a8c12 5875935689a9
    31      5461       0      0    5994 9a0ded718d65 92f58781e998 5875935689a9
    32      5461       0      0    5996 eaf7c806d1d8 9a0ded718d65 5875935689a9
    33      5461       0      0    5997 7a01f0a85473 eaf7c806d1d8 5875935689a9
*l* 34      5461       0      0    6002 bb8b9efa4b80 5875935689a9 7a01f0a85473
    35      5461       0      0    6470 f1bdbeadb899 9a0ded718d65 bb8b9efa4b80
    36      5461       0      0    6471 cbd9b03d140e bb8b9efa4b80 f1bdbeadb899
    37      5461       0      0    6543 c76039c9680a cbd9b03d140e bb8b9efa4b80
    38      5461       0      0    6547 4e9bf0139b17 c76039c9680a bb8b9efa4b80
    39      5461       0      0    6548 76c845f1d2d5 4e9bf0139b17 bb8b9efa4b80
    40      5461       0      0    6549 5208864a37be 76c845f1d2d5 bb8b9efa4b80
    41      5461       0      0    6551 9c5d203962ea 5208864a37be bb8b9efa4b80
    42      5461       0      0    6556 d389e0ededf6 9c5d203962ea bb8b9efa4b80
    43      5461       0      0    6557 a332477f52a4 d389e0ededf6 bb8b9efa4b80
    44      5461       0      0    6559 7848c2a9ad59 a332477f52a4 bb8b9efa4b80
    45      5461       0      0    6561 81bb4072eec5 7848c2a9ad59 a332477f52a4
    46      5461       0      0    6564 2308551ab59b 81bb4072eec5 cbd9b03d140e
    47      5461       0      0    6565 31b5f34782fb 2308551ab59b cbd9b03d140e
    48      5461       0      0    6567 84d2310e93b6 31b5f34782fb 2308551ab59b
    49      5461       0      0    6569 1aa9b89e62fd 84d2310e93b6 cbd9b03d140e
    50      5461       0      0    6570 0000515e1709 1aa9b89e62fd cbd9b03d140e
    51      5461       0      0    6586 4d70136ed4b2 cbd9b03d140e 0000515e1709
*a* 52      5461       0      0    6595 98955622ac12 0000515e1709 4d70136ed4b2

Well _that's_ odd. Ancestor is later in the history than your local
copy. I probably ought to take a look at that. Can you do this:

hg init empty
cd xen
hg bundle xen.hg ../empty

And send me the result?

> The human-readable log is here: 
> http://xenbits.xensource.com/ext/xenppc-unstable.hg?cmd=filelog;file=xen/arch/ia64/xenasm.S;filenode=bb8b9efa4b80c51fc29b1e5ae5cc8974e7d3b3e6
> 
> All those "merge" messages make me a little suspicious, since the file hasn't 
> seen much actual development for quite a while, but I don't know...

That's a side-effect of the old merge behavior. And I suspect this
merge issue is too.

-- 
Mathematics is the supreme nostalgia of our time.


More information about the Mercurial mailing list