Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-commit.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 04 Oct 2007 23:21:37 -0300
changeset 5378 8a2915f57dfc
parent 5371 17ed9b9a0d03
permissions -rw-r--r--
convert: add a mode where mercurial_sink skips empty revisions. The getchanges function of some converter_source classes can return some false positives. I.e. they sometimes claim that a file "foo" was changed in some revision, even though its contents are still the same. convert_svn is particularly bad, but I think this can also happen with convert_cvs and, at least in theory, with mercurial_source. For regular conversions this is not really a problem - as long as getfile returns the right contents, we'll get a converted revision with the right contents. But when we use --filemap, this could lead to superfluous revisions being converted. Instead of fixing every converter_source, I decided to change mercurial_sink to work around this problem. When --filemap is used, we're interested only in revisions that touch some specific files. If a revision doesn't change any of these files, then we're not interested in it (at least for revisions with a single parent; merges are special). For mercurial_sink, we abuse this property and rollback a commit if the manifest text hasn't changed. This avoids duplicating the logic from localrepo.filecommit to detect unchanged files.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4058
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
merging bar and foo
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     3
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 
(branch merge, don't forget to commit)
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     5
 
% contents of bar should be line0 line1 line2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     6
 
line0
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     7
 
line1
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     8
 
line2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     9
 
   rev    offset  length   base linkrev nodeid       p1           p2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    10
 
     0         0      77      0       2 da78c0659611 000000000000 000000000000
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    11
 
     1        77      76      0       3 4b358025380b 000000000000 da78c0659611
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    12
 
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    13
 
   rev    offset  length   base linkrev nodeid       p1           p2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    14
 
     0         0       7      0       0 690b295714ae 000000000000 000000000000
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    15
 
     1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    16
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    17
 
4:2d2f9a22c82b 2:0a3ab4856510
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    18
 
3:7d3b554bfdf1 2:0a3ab4856510 1:5cd961e4045d
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    19
 
2:0a3ab4856510 0:2665aaee66e9
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    20
 
1:5cd961e4045d
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    21
 
0:2665aaee66e9
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    22
 
% this should use bar@rev2 as the ancestor
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    23
 
resolving manifests
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    24
 
 overwrite None partial False
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    25
 
 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 4058
diff changeset 
    26
 
  searching for copies back to rev 1
4058
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    27
 
 bar: versions differ -> m
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    28
 
merging bar
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    29
 
my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    30
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    31
 
(branch merge, don't forget to commit)
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    32
 
% contents of bar should be line1 line2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    33
 
line1
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    34
 
line2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    35
 
   rev    offset  length   base linkrev nodeid       p1           p2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    36
 
     0         0      77      0       2 da78c0659611 000000000000 000000000000
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    37
 
     1        77      76      0       3 4b358025380b 000000000000 da78c0659611
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    38
 
     2       153       7      2       4 4defe5eec418 da78c0659611 000000000000
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    39
 
     3       160      13      3       5 4663501da27b 4defe5eec418 4b358025380b
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    40
 












e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    41














e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    42


requesting all changes













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    43


adding changesets













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    44


adding manifests













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    45


adding file changes













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    46


added 3 changesets with 3 changes to 2 files (+1 heads)













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    47


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    48


merging foo and bar













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    49


0 files updated, 1 files merged, 0 files removed, 0 files unresolved













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    50


(branch merge, don't forget to commit)













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    51


% contents of bar should be line0 line1 line2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    52


line0













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    53


line1













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    54


line2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    55


   rev    offset  length   base linkrev nodeid       p1           p2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    56


     0         0      77      0       2 da78c0659611 000000000000 000000000000













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    57


     1        77      76      0       3 4b358025380b 000000000000 da78c0659611













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    58


bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    59


   rev    offset  length   base linkrev nodeid       p1           p2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    60


     0         0       7      0       0 690b295714ae 000000000000 000000000000













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    61


     1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    62


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    63


4:2d2f9a22c82b 2:0a3ab4856510 













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    64


3:96ab80c60897 1:5cd961e4045d 2:0a3ab4856510 













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    65


2:0a3ab4856510 0:2665aaee66e9 













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    66


1:5cd961e4045d 













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    67


0:2665aaee66e9 













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    68


% this should use bar@rev2 as the ancestor













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    69


resolving manifests













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    70


 overwrite None partial False













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    71


 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897








5371






17ed9b9a0d03
merge: add debug diagnostics for findcopies



Matt Mackall <mpm@selenic.com>


parents: 
4058

diff
changeset




    72


  searching for copies back to rev 1








4058






e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    73


 bar: versions differ -> m













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    74


merging bar













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    75


my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    76


0 files updated, 1 files merged, 0 files removed, 0 files unresolved













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    77


(branch merge, don't forget to commit)













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    78


% contents of bar should be line1 line2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    79


line1













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    80


line2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    81


   rev    offset  length   base linkrev nodeid       p1           p2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    82


     0         0      77      0       2 da78c0659611 000000000000 000000000000













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    83


     1        77      76      0       3 4b358025380b 000000000000 da78c0659611













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    84


     2       153       7      2       4 4defe5eec418 da78c0659611 000000000000













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    85


     3       160      13      3       5 4663501da27b 4defe5eec418 4b358025380b















mercurial-crew-with-dirclash