Mercurial Mercurial > hg-stable / 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-changelog-exec.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Thu, 19 Nov 2009 11:06:01 +0900
branchstable
changeset 9900 8939900073a8
parent 6336 4b0c9c674707
permissions -rw-r--r--
inotify: improve error messages * prefix messages by inotify-(client|server) * make sure that all warning and abort messages use the same format. * in the case where inotify.sock is an old broken symlink, say so and abort instead of trying to overwrite the already existing link
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5227
466323968b23 Avoid adding to the changelog executable files added by the second parent.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
% manifest of p2:
466323968b23 Avoid adding to the changelog executable files added by the second parent.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
bar
466323968b23 Avoid adding to the changelog executable files added by the second parent.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     3
 
foo
466323968b23 Avoid adding to the changelog executable files added by the second parent.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 







6336






4b0c9c674707
warn about new heads on commit (issue842)



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
5227

diff
changeset




     5


created new head








5227






466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




     6


% manifest of p1:













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




     7


foo













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




     8


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













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




     9


(branch merge, don't forget to commit)













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    10


% this should not mention bar:













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    11


changeset:   3:ef2fc9b4a51b













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    12


tag:         tip













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    13


parent:      2:ed1b79f46b9a













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    14


parent:      1:d394a8db219b













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    15


user:        test













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    16


date:        Thu Jan 01 00:00:00 1970 +0000













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    17


description:













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    18


merge













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    19














466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    20














466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    21


   rev    offset  length   base linkrev nodeid       p1           p2













466323968b23
Avoid adding to the changelog executable files added by the second parent.



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


parents: 

diff
changeset




    22


     0         0       5      0       1 b004912a8510 000000000000 000000000000















hg-stable