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-empty-group.out
author Maxim Dounin <mdounin@mdounin.ru>
Sat, 27 Oct 2007 16:27:55 +0400
changeset 5483 0c43f87baba3
parent 4162 b2d9e553cdc8
permissions -rw-r--r--
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2339
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     1
 
adding init
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     2
 
adding x
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     3
 
adding y
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     4
 
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     5
 
adding x
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     6
 
adding y
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     7
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     8
 
(branch merge, don't forget to commit)
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     9
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    10
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    11
 
(branch merge, don't forget to commit)
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    12
 
requesting all changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    13
 
adding changesets
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    14
 
adding manifests
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    15
 
adding file changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    16
 
added 4 changesets with 3 changes to 3 files
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    17
 
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    18
 
requesting all changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    19
 
adding changesets
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    20
 
adding manifests
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    21
 
adding file changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    22
 
added 4 changesets with 3 changes to 3 files
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    23
 
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
4162
b2d9e553cdc8 incoming/outgoing: print the name of the other repo
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2339
diff changeset 
    24
 
comparing with b
2339
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    25
 
searching for changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    26
 
changeset:   4:fdb3c546e859
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    27
 
tag:         tip
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    28
 
parent:      1:1f703b3fcbc6
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    29
 
parent:      2:de997049e034
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    30
 
user:        test
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    31
 
date:        Mon Jan 12 13:46:40 1970 +0000
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    32
 
summary:     m2
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    33
 







4162






b2d9e553cdc8
incoming/outgoing: print the name of the other repo



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


parents: 
2339

diff
changeset




    34


comparing with c








2339






11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    35


searching for changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    36


changeset:   3:f40f830c0024













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    37


parent:      2:de997049e034













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    38


parent:      1:1f703b3fcbc6













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    39


user:        test













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    40


date:        Mon Jan 12 13:46:40 1970 +0000













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    41


summary:     m1













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    42









4162






b2d9e553cdc8
incoming/outgoing: print the name of the other repo



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


parents: 
2339

diff
changeset




    43


comparing with c








2339






11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    44


searching for changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    45


changeset:   3:f40f830c0024













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    46


tag:         tip













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    47


parent:      2:de997049e034













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    48


parent:      1:1f703b3fcbc6













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    49


user:        test













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    50


date:        Mon Jan 12 13:46:40 1970 +0000













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    51


summary:     m1













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    52









4162






b2d9e553cdc8
incoming/outgoing: print the name of the other repo



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


parents: 
2339

diff
changeset




    53


comparing with b








2339






11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    54


searching for changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    55


changeset:   3:fdb3c546e859













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    56


tag:         tip













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    57


parent:      1:1f703b3fcbc6













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    58


parent:      2:de997049e034













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    59


user:        test













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    60


date:        Mon Jan 12 13:46:40 1970 +0000













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    61


summary:     m2













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    62














11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    63


pulling from a













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    64


searching for changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    65


adding changesets













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    66


adding manifests













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    67


adding file changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    68


added 1 changesets with 0 changes to 0 files (+1 heads)













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    69


(run 'hg heads' to see heads, 'hg merge' to merge)













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    70


pulling from a













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    71


searching for changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    72


adding changesets













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    73


adding manifests













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    74


adding file changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    75


added 1 changesets with 0 changes to 0 files (+1 heads)













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    76


(run 'hg heads' to see heads, 'hg merge' to merge)















mercurial-crew-with-dirclash